ci: partially revert #7786 to fix post submit (#7807)

Signed-off-by: Lizan Zhou <[email protected]>
envoyproxy · Aug 2, 2019 · cd8574d · cd8574d
1 parent dd50110
commit cd8574d
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/.azure-pipelines/linux.yml b/.azure-pipelines/linux.yml
@@ -33,6 +33,8 @@ jobs:
       BAZEL_REMOTE_CACHE: grpcs://remotebuildexecution.googleapis.com
       BAZEL_REMOTE_INSTANCE: projects/envoy-ci/instances/default_instance
       GCP_SERVICE_ACCOUNT_KEY: $(GcpServiceAccountKey)
+      # TODO(lizan): remove this once new image is available
+      IMAGE_ID: b02c73f3ebbaf5c7852fa814eb3d61e841588068
     displayName: "Run CI script"
 
   - bash: |

diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -5,7 +5,7 @@ executors:
     description: "A regular build executor based on ubuntu image"
     docker:
       # NOTE: Update bazel/toolchains/rbe_toolchains_config.bzl with sha256 digest to match the image here.
-      - image: envoyproxy/envoy-build:b02c73f3ebbaf5c7852fa814eb3d61e841588068
+      - image: envoyproxy/envoy-build:8246167b9d238797cbc6c03dccc9e3921c37617d
     resource_class: xlarge
     working_directory: /source
 

diff --git a/ci/build_container/build_container_ubuntu.sh b/ci/build_container/build_container_ubuntu.sh
@@ -19,7 +19,7 @@ update-alternatives --config gcc
 update-alternatives --config g++
 
 apt-get install -y --no-install-recommends curl wget make cmake git python python-pip python-setuptools python3 python3-pip \
-  unzip bc libtool ninja-build automake zip time gdb strace tshark tcpdump patch xz-utils rsync \
+  unzip bc libtool ninja-build automake zip time gdb strace tshark tcpdump patch xz-utils rsync ssh-client
 
 # clang 8.
 case $ARCH in