From 9b4112514cac3023729c5c44e3f0f9cc9a4a5da0 Mon Sep 17 00:00:00 2001 From: Matthias Bisping Date: Fri, 18 Mar 2022 13:44:12 +0100 Subject: [PATCH] nexus auth --- .../src/main/resources/scripts/docker-build.sh | 1 - run_tests.sh | 12 ++++++++---- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/bamboo-specs/src/main/resources/scripts/docker-build.sh b/bamboo-specs/src/main/resources/scripts/docker-build.sh index 3ddde8d..bce07f2 100755 --- a/bamboo-specs/src/main/resources/scripts/docker-build.sh +++ b/bamboo-specs/src/main/resources/scripts/docker-build.sh @@ -11,4 +11,3 @@ echo "index-url = https://${bamboo_nexus_user}:${bamboo_nexus_password}@nexus.iq docker build -f Dockerfile -t nexus.iqser.com:5001/red/$SERVICE_NAME:${bamboo_version_tag} . echo "${bamboo_nexus_password}" | docker login --username "${bamboo_nexus_user}" --password-stdin nexus.iqser.com:5001 docker push nexus.iqser.com:5001/red/$SERVICE_NAME:${bamboo_version_tag} -docker push nexus.iqser.com:5001/red/${SERVICE_NAME}_tests:${bamboo_version_tag} diff --git a/run_tests.sh b/run_tests.sh index 5f3f1c3..02de3f3 100755 --- a/run_tests.sh +++ b/run_tests.sh @@ -1,4 +1,5 @@ -docker build -f Dockerfile_tests -t pyinfra-tests . +echo "${bamboo_nexus_password}" | docker login --username "${bamboo_nexus_user}" --password-stdin nexus.iqser.com:5001 +docker build -f Dockerfile_tests -t pyinfra-tests:dev . source build_venv/bin/activate python3 -m pip install --upgrade pip @@ -9,6 +10,9 @@ docker-compose -remove-orphans up -d echo "Sleeping for 30 seconds to wait for dependency containers to finish startup..." sleep 30s -docker rm /pyinfra-tests -docker run --net=host --name pyinfra-tests pyinfra-tests -docker cp pyinfra-tests:/app/service/reports/coverage.xml reports/coverage.xml +rnd=$(date +"%s") +name=pyinfra-tests-${rnd} + +docker run --net=host --name $name pyinfra-tests:dev +docker cp $name:/app/service/reports/coverage.xml reports/coverage.xml +docker rm $name