Skip to content

Commit 59e237f

Browse files
committed
Revert CI jobs to use the default images
We no longer need the custom ones with OpenSSL. Signed-off-by: Jonh Wendell <[email protected]>
1 parent 50bd207 commit 59e237f

File tree

5 files changed

+4
-6
lines changed

5 files changed

+4
-6
lines changed

.bazelrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -524,7 +524,7 @@ common:bes-envoy-engflow --bes_timeout=3600s
524524
common:bes-envoy-engflow --bes_upload_mode=fully_async
525525
common:bes-envoy-engflow --nolegacy_important_outputs
526526
common:rbe-envoy-engflow --remote_executor=grpcs://mordenite.cluster.engflow.com
527-
common:rbe-envoy-engflow --remote_default_exec_properties=container-image=docker://quay.io/jwendell/envoy-build-ubuntu@sha256:3eb12d3f8639ec7c6202c57c62db5fdf9e8abae1c74d9ec165b259407ab3c022
527+
common:rbe-envoy-engflow --remote_default_exec_properties=container-image=docker://gcr.io/envoy-ci/envoy-build@sha256:7adc40c09508f957624c4d2e0f5aeecb73a59207ee6ded53b107eac828c091b2
528528
common:rbe-envoy-engflow --jobs=200
529529
common:rbe-envoy-engflow --define=engflow_rbe=true
530530

.github/workflows/envoy-openssl.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,5 +32,3 @@ jobs:
3232
ENVOY_RBE: 1
3333
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
3434
ENVOY_STDLIB: libstdc++
35-
IMAGE_NAME: quay.io/jwendell/envoy-build-ubuntu
36-
IMAGE_ID: openssl-cb86d91cf406995012e330ab58830e6ee10240cb

bazel/rbe/toolchains/configs/linux/clang/config/BUILD

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ platform(
4242
"@bazel_tools//tools/cpp:clang",
4343
],
4444
exec_properties = {
45-
"container-image": "docker://quay.io/jwendell/envoy-build-ubuntu@sha256:3eb12d3f8639ec7c6202c57c62db5fdf9e8abae1c74d9ec165b259407ab3c022",
45+
"container-image": "docker://gcr.io/envoy-ci/envoy-build@sha256:7adc40c09508f957624c4d2e0f5aeecb73a59207ee6ded53b107eac828c091b2",
4646
"OSFamily": "Linux",
4747
},
4848
parents = ["@local_config_platform//:host"],

bazel/rbe/toolchains/configs/linux/clang_libcxx/config/BUILD

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ platform(
4242
"@bazel_tools//tools/cpp:clang",
4343
],
4444
exec_properties = {
45-
"container-image": "docker://quay.io/jwendell/envoy-build-ubuntu@sha256:3eb12d3f8639ec7c6202c57c62db5fdf9e8abae1c74d9ec165b259407ab3c022",
45+
"container-image": "docker://gcr.io/envoy-ci/envoy-build@sha256:7adc40c09508f957624c4d2e0f5aeecb73a59207ee6ded53b107eac828c091b2",
4646
"OSFamily": "Linux",
4747
},
4848
parents = ["@local_config_platform//:host"],

bazel/rbe/toolchains/configs/linux/gcc/config/BUILD

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ platform(
4242
"@bazel_tools//tools/cpp:clang",
4343
],
4444
exec_properties = {
45-
"container-image": "docker://quay.io/jwendell/envoy-build-ubuntu@sha256:3eb12d3f8639ec7c6202c57c62db5fdf9e8abae1c74d9ec165b259407ab3c022",
45+
"container-image": "docker://gcr.io/envoy-ci/envoy-build@sha256:7adc40c09508f957624c4d2e0f5aeecb73a59207ee6ded53b107eac828c091b2",
4646
"OSFamily": "Linux",
4747
},
4848
parents = ["@local_config_platform//:host"],

0 commit comments

Comments
 (0)