From 28cf7cd0891445f46eed1ae683f4aa5f646a517c Mon Sep 17 00:00:00 2001 From: Troy Dai Date: Mon, 12 Mar 2018 15:26:43 -0700 Subject: [PATCH] Update test Image building (#5784) * Stop downloading a01droid or a01dispatcher * Copy private build in build script --- scripts/ci/build.sh | 6 ++++++ scripts/ci/build_droid.sh | 10 ---------- 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/scripts/ci/build.sh b/scripts/ci/build.sh index 6fac9a2009e..3d6798cb241 100755 --- a/scripts/ci/build.sh +++ b/scripts/ci/build.sh @@ -52,6 +52,12 @@ for setup_file in $(find src -name 'setup.py'); do popd >/dev/null done +############################################## +# copy private packages +if [ -z ./privates ]; then + cp ./privates/*.whl $output_dir +fi + ############################################## # build test packages title 'Build Azure CLI tests package' diff --git a/scripts/ci/build_droid.sh b/scripts/ci/build_droid.sh index 7df557f643d..c65f16bcb33 100755 --- a/scripts/ci/build_droid.sh +++ b/scripts/ci/build_droid.sh @@ -30,16 +30,6 @@ cp $dp0/a01/dockerfiles/py36/Dockerfile artifacts/ # Move other scripts for docker cp -R $dp0/a01/* artifacts/ -title 'Downloading applications' - -curl -L https://a01tools.blob.core.windows.net/droid/latest/linux/a01droid \ - -o artifacts/docker_app/a01droid -chmod +x artifacts/docker_app/a01droid - -curl -L https://a01tools.blob.core.windows.net/droid/latest/linux/a01dispatcher \ - -o artifacts/docker_app/a01dispatcher -chmod +x artifacts/docker_app/a01dispatcher - ############################################# # for travis repo slug, remove the suffix to reveal the owner # - the offical repo will generate image: azurecli-test-Azure