Skip to content

Commit e6a7cb4

Browse files
committed
Fix CI tests Docker build
1 parent b28328e commit e6a7cb4

File tree

4 files changed

+7
-7
lines changed

4 files changed

+7
-7
lines changed

.ci/e2e/publish_tests/dev_docker_setup/setup.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,11 +28,11 @@ SCRIPT_DIR=`realpath $(dirname "${BASH_SOURCE[0]}")`
2828

2929
mkdir -p $3
3030
cd $3
31-
az acr login --name $1
31+
az acr login --name $1 --output none
3232
git clone https://github.com/Azure/azure-functions-docker
33-
docker build -f ./azure-functions-docker/host/2.0/stretch/amd64/base.Dockerfile ./azure-functions-docker/host/2.0/stretch/amd64 -t azure-functions-base-dev
33+
docker build -f ./azure-functions-docker/host/2.0/stretch/amd64/python-deps.Dockerfile ./azure-functions-docker/host/2.0/stretch/amd64 -t azure-functions-python-deps-dev
3434
# The directory to build from needs to be the amd64, because the Dockerfile copies resources
35-
docker build --build-arg BASE_IMAGE=azure-functions-base-dev -f ./azure-functions-docker/host/2.0/stretch/amd64/python.Dockerfile -t azure-functions-python-dev ./azure-functions-docker/host/2.0/stretch/amd64
35+
docker build --build-arg BASE_PYTHON_IMAGE=azure-functions-python-deps-dev -f ./azure-functions-docker/host/2.0/stretch/amd64/python-buildenv.Dockerfile -t azure-functions-python-dev ./azure-functions-docker/host/2.0/stretch/amd64
3636
docker build --build-arg BASE_IMAGE=azure-functions-python-dev -f ${SCRIPT_DIR}/dev.Dockerfile ${SCRIPT_DIR}/../../../.. -t azure-functions-python-dev-updated
3737
docker tag azure-functions-python-dev-updated $1.azurecr.io/$2
3838
docker push $1.azurecr.io/$2

.ci/e2e/publish_tests/test_runners/run_all_parallel.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ YELLOW='\033[1;33m'
1515
# This may be needed if docker image is restarted
1616
# Better to simply login again at every invoke
1717
echo "Ensuring login to Azure ACR"
18-
az acr login --name ${ACR_NAME} > /dev/null
18+
az acr login --name ${ACR_NAME} --output none
1919

2020
echo -e "Starting Parallel execution in background"
2121

.ci/e2e/publish_tests/test_runners/run_all_serial.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ YELLOW='\033[1;33m'
1515
# This may be needed if docker image is restarted
1616
# Better to simply login again at every invoke
1717
echo "Ensuring login to Azure ACR"
18-
az acr login --name ${ACR_NAME} > /dev/null
18+
az acr login --name ${ACR_NAME} --output none
1919

2020
echo -e "Starting Serial Execution..."
2121
echo "This will take a while"
@@ -40,7 +40,7 @@ run_test ${BASE_DIR}/prod_func_prod_docker/new_no_bundler.sh ${TESTS_LOGS}/pfpdn
4040
run_test ${BASE_DIR}/prod_func_prod_docker/new_packapp.sh ${TESTS_LOGS}/pfpdnpa.log ${TESTS_TIMEOUT} ${WORKING_DIR}/pfpdnpa.result
4141

4242
echo "Ensuring login to Azure ACR (again because login has been flaky)"
43-
az acr login --name ${ACR_NAME} > /dev/null
43+
az acr login --name ${ACR_NAME} --output none
4444
run_test ${BASE_DIR}/prod_func_dev_docker/customer_build_native_deps.sh ${TESTS_LOGS}/pfddcbnd.log ${TESTS_TIMEOUT} ${WORKING_DIR}/pfddcbnd.result
4545
run_test ${BASE_DIR}/prod_func_dev_docker/customer_no_bundler.sh ${TESTS_LOGS}/pfddcnb.log ${TESTS_TIMEOUT} ${WORKING_DIR}/pfddcnb.result
4646
run_test ${BASE_DIR}/prod_func_dev_docker/new_build_native_deps.sh ${TESTS_LOGS}/pfddnbnd.log ${TESTS_TIMEOUT} ${WORKING_DIR}/pfddnbnd.result

.ci/e2e/publish_tests/test_runners/setup_test_environment.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ set -e
55
source "$(dirname "${BASH_SOURCE[0]}")/helpers/get_config_variables.sh"
66

77
# Login to the Service Principal Azure Account
8-
az login --service-principal -u ${SP_USER_NAME} -p ${SP_PASSWORD} --tenant ${SP_TENANT}
8+
az login --service-principal -u ${SP_USER_NAME} -p ${SP_PASSWORD} --tenant ${SP_TENANT} --output none
99

1010
# Update the ACR Docker Image with the dev branch of Docker image and python worker
1111
chmod a+x $(dirname "${BASH_SOURCE[0]}")/../dev_docker_setup/setup.sh

0 commit comments

Comments
 (0)