Skip to content

Migrate EngFlow configurations from rbe_autoconfig to rbe_configs_gen#2037

Merged
jpsim merged 7 commits intoenvoyproxy:mainfrom
jpsim:rbe_configs_gen
Feb 3, 2022
Merged

Migrate EngFlow configurations from rbe_autoconfig to rbe_configs_gen#2037
jpsim merged 7 commits intoenvoyproxy:mainfrom
jpsim:rbe_configs_gen

Conversation

@jpsim
Copy link
Copy Markdown
Contributor

@jpsim jpsim commented Feb 2, 2022

Following the instructions in https://github.com/bazelbuild/bazel-toolchains

Specifically:

$ ./rbe_configs_gen \
        --bazel_version="4.2.1" \
        --toolchain_container="docker.io/envoyproxy/envoy-build-ubuntu:514e2f7bc36c1f0495a523b16aab9168a4aa13b6" \
        --exec_os="linux" \
        --target_os="linux" \
        --output_src_root="/path/to/envoy-mobile" \
        --output_config_path="third_party/rbe_configs" \
        --cpp_env_json=clang.json \
        --generate_java_configs=False
$ cat clang.json
{"CC": "/opt/llvm/bin/clang", "CXX": "/opt/llvm/bin/clang++"}

This will be necessary to migrate to Bazel 5.0.0.

jpsim added 3 commits February 2, 2022 14:25
Following the instructions in https://github.com/bazelbuild/bazel-toolchains

Specifically:

    $ ./rbe_configs_gen \
            --bazel_version="4.2.1" \
            --toolchain_container="docker.io/envoyproxy/envoy-build-ubuntu:514e2f7bc36c1f0495a523b16aab9168a4aa13b6" \
            --exec_os="linux" \
            --target_os="linux" \
            --output_src_root="/path/to/envoy-mobile" \
            --output_config_path="third_party/rbe_configs" \
            --cpp_env_json=clang.json \
            --generate_java_configs=False
    $ cat clang.json
    {"CC": "/opt/llvm/bin/clang", "CXX": "/opt/llvm/bin/clang++"}

Signed-off-by: JP Simard <jp@jpsim.com>
Signed-off-by: JP Simard <jp@jpsim.com>
Signed-off-by: JP Simard <jp@jpsim.com>
@jpsim jpsim marked this pull request as ready for review February 2, 2022 20:41
@jpsim jpsim requested a review from keith February 2, 2022 20:41
@keith
Copy link
Copy Markdown
Member

keith commented Feb 2, 2022

@Yannic can you review? is this how this should work now?

@Yannic
Copy link
Copy Markdown
Contributor

Yannic commented Feb 2, 2022

@lfpino PTAL

@lfpino
Copy link
Copy Markdown
Contributor

lfpino commented Feb 2, 2022

I'll take a look @keith, can you please add me as a reviewer?

@keith
Copy link
Copy Markdown
Member

keith commented Feb 2, 2022

I cannot, maybe you have to be part of the org to be added as a reviewer?

@jpsim
Copy link
Copy Markdown
Contributor Author

jpsim commented Feb 2, 2022

The GitHub UI also won't let me.

image

@lfpino
Copy link
Copy Markdown
Contributor

lfpino commented Feb 2, 2022

I guess I'll review nonetheless :')

Copy link
Copy Markdown
Contributor

@lfpino lfpino left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The change is almost there but the current toolchain would break coverage so please fix that one first.

jpsim added 4 commits February 3, 2022 12:18
Signed-off-by: JP Simard <jp@jpsim.com>
Signed-off-by: JP Simard <jp@jpsim.com>
So that only the platforms that need the `SYS_PTRACE` Docker capability have it.

Signed-off-by: JP Simard <jp@jpsim.com>
This reverts commit f7fdb4c.

Signed-off-by: JP Simard <jp@jpsim.com>
@jpsim
Copy link
Copy Markdown
Contributor Author

jpsim commented Feb 3, 2022

Thanks for the review, @lfpino.

  • Coverage was indeed broken, that's fixed now. The CI job was effectively being skipped because this PR didn't touch any source or test files
  • I've split out the asan platform into its own configuration so that other executions don't have the SYS_PTRACE Docker capability since it's generally not needed

Can you please take another look?

Copy link
Copy Markdown
Contributor

@lfpino lfpino left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM!

@jpsim jpsim merged commit c4025df into envoyproxy:main Feb 3, 2022
@jpsim jpsim deleted the rbe_configs_gen branch February 3, 2022 19:55
jpsim added a commit to jpsim/envoy-mobile that referenced this pull request Feb 3, 2022
* main:
  envoy: 71248e512 (envoyproxy#2027)
  Migrate EngFlow configurations from rbe_autoconfig to rbe_configs_gen (envoyproxy#2037)
  timing test (envoyproxy#2035)
  [CI] Update Xcode to 13.2.1 (envoyproxy#1997)
  owners: adding charles (envoyproxy#2038)

Signed-off-by: JP Simard <jp@jpsim.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants