Skip to content
Snippets Groups Projects

.gitlab-ci.yml: test -z && construct passes fails to job

Merged Wouter Deconinck requested to merge gitlab-ci-yml-avoid-test-and into master
1 file
+ 8
6
Compare changes
  • Side-by-side
  • Inline
+ 8
6
@@ -277,10 +277,11 @@ jug_xl:nightly:
@@ -277,10 +277,11 @@ jug_xl:nightly:
- ./gitlab-ci/docker_push.sh -i ${BUILD_IMAGE} -l ${NIGHTLY_TAG}
- ./gitlab-ci/docker_push.sh -i ${BUILD_IMAGE} -l ${NIGHTLY_TAG}
-n $DOCKER_NTRIES -t $DOCKER_WAIT_TIME
-n $DOCKER_NTRIES -t $DOCKER_WAIT_TIME
${NIGHTLY_TAG} ${PUSH_FLAG}
${NIGHTLY_TAG} ${PUSH_FLAG}
- test -z "${PUSH_FLAG}" && ./gitlab-ci/docker_push.sh
- if [ -z "${PUSH_FLAG}" ] ; then
-i ${BUILD_IMAGE} -l ${NIGHTLY_TAG}
./gitlab-ci/docker_push.sh -i ${BUILD_IMAGE} -l ${NIGHTLY_TAG}
-n $DOCKER_NTRIES -t $DOCKER_WAIT_TIME
-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:
jug_xl:feature:
extends: .build
extends: .build
@@ -318,10 +319,11 @@ jug_xl:feature:
@@ -318,10 +319,11 @@ jug_xl:feature:
- ./gitlab-ci/docker_push.sh -i ${BUILD_IMAGE} -l ${INTERNAL_TAG}-${DETECTOR}-${DETECTOR_BRANCH}
- ./gitlab-ci/docker_push.sh -i ${BUILD_IMAGE} -l ${INTERNAL_TAG}-${DETECTOR}-${DETECTOR_BRANCH}
-n ${DOCKER_NTRIES} -t ${DOCKER_WAIT_TIME}
-n ${DOCKER_NTRIES} -t ${DOCKER_WAIT_TIME}
${FEATURE_EXPORT_TAG} ${PUSH_FLAG}
${FEATURE_EXPORT_TAG} ${PUSH_FLAG}
- test -z "${PUSH_FLAG}" && ./gitlab-ci/docker_push.sh
- if [ test -z "${PUSH_FLAG}" ] ; then
-i ${BUILD_IMAGE} -l ${INTERNAL_TAG}-${DETECTOR}-${DETECTOR_BRANCH}
./gitlab-ci/docker_push.sh -i ${BUILD_IMAGE} -l ${INTERNAL_TAG}-${DETECTiOR}-${DETECTOR_BRANCH}
-n ${DOCKER_NTRIES} -t ${DOCKER_WAIT_TIME}
-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:
.singularity:
stage: deploy
stage: deploy
Loading