From ec9150342c7d270216faf8df87ecc9e1e8fc373b Mon Sep 17 00:00:00 2001 From: Lizan Zhou Date: Wed, 31 Jul 2019 22:43:03 +0000 Subject: [PATCH 1/3] ci: add missing tools back to build image Signed-off-by: Lizan Zhou --- ci/build_container/build_container_ubuntu.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ci/build_container/build_container_ubuntu.sh b/ci/build_container/build_container_ubuntu.sh index e329a67eafd76..5a11ae1a5af4e 100755 --- a/ci/build_container/build_container_ubuntu.sh +++ b/ci/build_container/build_container_ubuntu.sh @@ -18,8 +18,8 @@ update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-7 1000 update-alternatives --config gcc update-alternatives --config g++ -apt-get install -y --no-install-recommends curl wget make cmake git python python-pip python3 python3-pip \ - unzip bc libtool ninja-build automake zip time gdb strace tshark tcpdump patch \ +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 \ # clang 8. case $ARCH in From 0ffe44261b18ed712713af0bf038147225bcc6c2 Mon Sep 17 00:00:00 2001 From: Lizan Zhou Date: Wed, 31 Jul 2019 23:16:28 +0000 Subject: [PATCH 2/3] just test Signed-off-by: Lizan Zhou --- ci/envoy_build_sha.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/envoy_build_sha.sh b/ci/envoy_build_sha.sh index 709617afe9b68..6101f36e3534b 100644 --- a/ci/envoy_build_sha.sh +++ b/ci/envoy_build_sha.sh @@ -1,2 +1,2 @@ -ENVOY_BUILD_SHA=$(grep envoyproxy/envoy-build .circleci/config.yml | sed -e 's#.*envoyproxy/envoy-build:\(.*\)#\1#' | uniq) +ENVOY_BUILD_SHA=$(grep envoyproxy/envoy-build .circleci/config.yml | sed -e 's#.*lizan/envoy-build:\(.*\)#\1#' | uniq) [[ $(wc -l <<< "${ENVOY_BUILD_SHA}" | awk '{$1=$1};1') == 1 ]] || (echo ".circleci/config.yml hashes are inconsistent!" && exit 1) From 1a2a514210c1b667926256a88a26975549d418c2 Mon Sep 17 00:00:00 2001 From: Lizan Zhou Date: Wed, 31 Jul 2019 23:18:12 +0000 Subject: [PATCH 3/3] Revert "just test" This reverts commit 0ffe44261b18ed712713af0bf038147225bcc6c2. Signed-off-by: Lizan Zhou --- ci/envoy_build_sha.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/envoy_build_sha.sh b/ci/envoy_build_sha.sh index 6101f36e3534b..709617afe9b68 100644 --- a/ci/envoy_build_sha.sh +++ b/ci/envoy_build_sha.sh @@ -1,2 +1,2 @@ -ENVOY_BUILD_SHA=$(grep envoyproxy/envoy-build .circleci/config.yml | sed -e 's#.*lizan/envoy-build:\(.*\)#\1#' | uniq) +ENVOY_BUILD_SHA=$(grep envoyproxy/envoy-build .circleci/config.yml | sed -e 's#.*envoyproxy/envoy-build:\(.*\)#\1#' | uniq) [[ $(wc -l <<< "${ENVOY_BUILD_SHA}" | awk '{$1=$1};1') == 1 ]] || (echo ".circleci/config.yml hashes are inconsistent!" && exit 1)