From 8cf54ab6d5b11c53b79a0243bb9635e415777003 Mon Sep 17 00:00:00 2001
From: Wouter Deconinck <wdconinc@gmail.com>
Date: Thu, 23 Dec 2021 15:53:05 +0000
Subject: [PATCH] .gitlab-ci.yml: test -z && construct passes fails to job
---
.gitlab-ci.yml | 14 ++++++++------
1 file changed, 8 insertions(+), 6 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 40d1b0caf..05208d496 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -277,10 +277,11 @@ jug_xl:nightly:
- ./gitlab-ci/docker_push.sh -i ${BUILD_IMAGE} -l ${NIGHTLY_TAG}
-n $DOCKER_NTRIES -t $DOCKER_WAIT_TIME
${NIGHTLY_TAG} ${PUSH_FLAG}
- - test -z "${PUSH_FLAG}" && ./gitlab-ci/docker_push.sh
- -i ${BUILD_IMAGE} -l ${NIGHTLY_TAG}
+ - if [ -z "${PUSH_FLAG}" ] ; then
+ ./gitlab-ci/docker_push.sh -i ${BUILD_IMAGE} -l ${NIGHTLY_TAG}
-n $DOCKER_NTRIES -t $DOCKER_WAIT_TIME
- ${NIGHTLY_TAG}-$(date +%Y-%m-%d) --dockerhub
+ ${NIGHTLY_TAG}-$(date +%Y-%m-%d) --dockerhub ;
+ fi
jug_xl:feature:
extends: .build
@@ -318,10 +319,11 @@ jug_xl:feature:
- ./gitlab-ci/docker_push.sh -i ${BUILD_IMAGE} -l ${INTERNAL_TAG}-${DETECTOR}-${DETECTOR_BRANCH}
-n ${DOCKER_NTRIES} -t ${DOCKER_WAIT_TIME}
${FEATURE_EXPORT_TAG} ${PUSH_FLAG}
- - test -z "${PUSH_FLAG}" && ./gitlab-ci/docker_push.sh
- -i ${BUILD_IMAGE} -l ${INTERNAL_TAG}-${DETECTOR}-${DETECTOR_BRANCH}
+ - if [ test -z "${PUSH_FLAG}" ] ; then
+ ./gitlab-ci/docker_push.sh -i ${BUILD_IMAGE} -l ${INTERNAL_TAG}-${DETECTiOR}-${DETECTOR_BRANCH}
-n ${DOCKER_NTRIES} -t ${DOCKER_WAIT_TIME}
- ${FEATURE_EXPORT_TAG}-$(date +%Y-%m-%d) --dockerhub
+ ${FEATURE_EXPORT_TAG}-$(date +%Y-%m-%d) --dockerhub ;
+ if
.singularity:
stage: deploy
--
GitLab