From 6a4a291af0024efd873071a7a90305a73bf0fb4f Mon Sep 17 00:00:00 2001
From: Timm Fitschen <t.fitschen@indiscale.com>
Date: Mon, 7 Jun 2021 01:12:00 +0200
Subject: [PATCH] WIP: pipeline
---
.gitlab-ci.yml | 11 ++++-------
1 file changed, 4 insertions(+), 7 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 5f02bc3..207914b 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -78,13 +78,14 @@ build-testenv:
## Determine the cppinttest branch...
# ... use an f-branch if posible...
- if echo "$CI_COMMIT_REF_NAME" | grep -c "^f-" ; then
- # this is an f-branch
CPPINT_REF=$CI_COMMIT_REF_NAME ;
fi
+
# ... or use main if possible...
- if [[ "$CI_COMMIT_REF_NAME" == "main" ]] ; then
CPPINT_REF=main ;
fi
+
# ... and fall-back to dev
- CPPINT_REF=${CPPINT_REF:-dev}
@@ -136,7 +137,6 @@ test:
- docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY
- if [[ "$CAOSDB_TAG" == "" ]]; then
- # the CAOSDB_TAG has to be guessed...
if echo "$F_BRANCH" | grep -c "^f-" ; then
CAOSDB_TAG=${DEPLOY_REF}_F_${F_BRANCH}-latest;
echo "Load deploy images with tag $CAOSDB_TAG ..."
@@ -146,17 +146,14 @@ test:
echo "Load deploy images with tag $CAOSDB_TAG ..."
docker pull $CI_REGISTRY/caosdb/src/caosdb-deploy:$CAOSDB_TAG ;
echo "Load deploy images with tag $CAOSDB_TAG ... success"
- fi
-
+ fi ;
else
- # no F_BRANCH -> use default DEPLOY_REF branch
CAOSDB_TAG=${DEPLOY_REF}-latest ;
echo "Load deploy images with tag $CAOSDB_TAG ..."
docker pull $CI_REGISTRY/caosdb/src/caosdb-deploy:$CAOSDB_TAG ;
echo "Load deploy images with tag $CAOSDB_TAG ... success"
fi;
else
- # If the CAOSDB_TAG was given
echo "Load deploy images with tag $CAOSDB_TAG ..."
docker pull $CI_REGISTRY/caosdb/src/caosdb-deploy:$CAOSDB_TAG ;
echo "Load deploy images with tag $CAOSDB_TAG ... success"
@@ -165,8 +162,8 @@ test:
- docker load < /image-cache/${CPPINTTEST_IMAGE_CACHE} || true
- docker pull $CPPINTTEST_REGISTRY_IMAGE
- # load any(!!!) mariab image
- docker load < /image-cache/mariadb.tar || true
+ # load any(!!!) mariab image
- cd .docker
# here the server and the mysql backend docker are being started
--
GitLab