From d91a20396e280641cbbb286cefa968dd8640222f Mon Sep 17 00:00:00 2001
From: lukken <lukken@astron.nl>
Date: Wed, 17 Nov 2021 12:56:19 +0000
Subject: [PATCH] L2SS-205: Ensure lofar20rc is sourced in pipeline
---
.gitlab-ci.yml | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 0f5ccfb10..7e0a886c1 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
--
GitLab