From 7c9cbf7e2b91b8965e8b6fc1cf55909279543d36 Mon Sep 17 00:00:00 2001 From: Timm Fitschen <t.fitschen@indiscale.com> Date: Wed, 6 Jul 2022 12:44:07 +0200 Subject: [PATCH] PIPELINE: fix pipeline --- .gitlab-ci.yml | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b885dc6..e4ad820 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -118,17 +118,20 @@ test: - job: build-test script: - echo $PWD + - echo "F_BRANCH = $F_BRANCH" + - echo "CAOSDB_TAG = $CAOSDB_TAG" + - echo "DEPLOY_REF = $DEPLOY_REF" - ls -la - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY - - if [[ "$CAOSDB_TAG" == "" ]]; then + - if [ -z "$CAOSDB_TAG" ]; then if echo "$F_BRANCH" | grep -c "^f-" ; then CAOSDB_TAG=${DEPLOY_REF}_F_${F_BRANCH}; docker pull $CI_REGISTRY/caosdb/src/caosdb-deploy:$CAOSDB_TAG || CAOSDB_TAG="${DEFAULT_CAOSDB_TAG}" ; - elif [ "$F_BRANCH" == "main" ] ; then + elif [ "$F_BRANCH" = "main" ] ; then CAOSDB_TAG=main ; - elif [ "$F_BRANCH" == "dev" ] ; then + elif [ "$F_BRANCH" = "dev" ] ; then CAOSDB_TAG=dev ; else CAOSDB_TAG="${DEFAULT_CAOSDB_TAG}" ; -- GitLab