diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 0f5ccfb103e99373d337dd0170faf78fb37f903d..7e0a886c1c8eb799449f9593d6323de937b1cea5 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -176,10 +176,6 @@ integration_test_docker: - apk add --update make bash docker-compose - apk add --update bind-tools - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY -# Allow docker image script to execute - - chmod u+x $CI_PROJECT_DIR/sbin/tag_and_push_docker_image.sh -# Do not remove 'bash' or statement will be ignored by primitive docker shell - - bash $CI_PROJECT_DIR/sbin/tag_and_push_docker_image.sh pull $tag script: - touch /root/.Xauthority # Hack BASH_SOURCE into sourced files, docker its sh shell won't set this @@ -192,6 +188,10 @@ integration_test_docker: - . bootstrap/etc/lofar20rc.sh || true # TANGO_HOST must be unset our databaseds will be unreachable - unset TANGO_HOST +# Allow docker image script to execute + - chmod u+x $CI_PROJECT_DIR/sbin/tag_and_push_docker_image.sh +# Do not remove 'bash' or statement will be ignored by primitive docker shell + - bash $CI_PROJECT_DIR/sbin/tag_and_push_docker_image.sh pull $tag # Allow integration test to execute - chmod u+x $CI_PROJECT_DIR/sbin/run_integration_test.sh # Do not remove 'bash' or statement will be ignored by primitive docker shell