From b39e0f1fc1c344fccd4e02d9b86e629f5129ee1b Mon Sep 17 00:00:00 2001
From: Timm Fitschen <t.fitschen@indiscale.com>
Date: Mon, 7 Jun 2021 03:46:37 +0200
Subject: [PATCH] WIP: pipeline
---
.gitlab-ci.yml | 72 +++++---------------------------------------------
1 file changed, 6 insertions(+), 66 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 33cb6f1..d97df52 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -65,54 +65,6 @@ info:
- echo "$CI_REGISTRY_IMAGE_BASE"
- echo "$CPPINTTEST_REGISTRY_IMAGE"
- echo "$CPPINTTEST_IMAGE_CACHE"
- - if [ "$CAOSDB_TAG" == "" ] ; then
- echo "here1";
- else
- echo "Load deploy images with tag $CAOSDB_TAG ..."
- echo "Load deploy images with tag $CAOSDB_TAG ... success"
- fi
- - if [ "$CAOSDB_TAG" == "" ] ; then
- if echo "$F_BRANCH" | grep -c "^f-" ; then
- CAOSDB_TAG=${DEPLOY_REF}_F_${F_BRANCH}-latest;
- echo "Load deploy images with tag $CAOSDB_TAG ..."
- else
- 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
- 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
- - if ! docker pull "${CI_REGISTRY}/caosdb/src/caosdb-deploy:${CAOSDB_TAG}" ; then
- echo "Load deploy images with tag $CAOSDB_TAG ... error. Try another" ;
- echo "Load deploy images with tag $CAOSDB_TAG ..."
- echo "Load deploy images with tag $CAOSDB_TAG ... success"
- fi ;
- - if [ "$CAOSDB_TAG" == "" ] ; then
- if echo "$F_BRANCH" | grep -c "^f-" ; then
- CAOSDB_TAG=${DEPLOY_REF}_F_${F_BRANCH}-latest;
- echo "Load deploy images with tag $CAOSDB_TAG ..."
- if ! docker pull "${CI_REGISTRY}/caosdb/src/caosdb-deploy:${CAOSDB_TAG}" ; then
- echo "Load deploy images with tag $CAOSDB_TAG ... error. Try another" ;
- 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
- 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
- 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
# Build a docker image in which tests for this repository can run
@@ -187,28 +139,16 @@ test:
- docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY
- - if [[ "$CAOSDB_TAG" == "" ]] ; then
+
+ - if [[ "$CAOSDB_TAG" == "" ]]; then
if echo "$F_BRANCH" | grep -c "^f-" ; then
- CAOSDB_TAG=${DEPLOY_REF}_F_${F_BRANCH}-latest ;
- echo "Load deploy images with tag $CAOSDB_TAG ..." ;
- if ! docker pull "${CI_REGISTRY}/caosdb/src/caosdb-deploy:${CAOSDB_TAG}" ; then
- echo "Load deploy images with tag $CAOSDB_TAG ... error. Try another" ;
- 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 ;
+ CAOSDB_TAG=${DEPLOY_REF}_F_${F_BRANCH}-latest;
+ docker pull $CI_REGISTRY/caosdb/src/caosdb-deploy:$CAOSDB_TAG || CAOSDB_TAG=${DEPLOY_REF}-latest ;
else
- 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" ;
+ CAOSDB_TAG=${DEPLOY_REF}-latest;
fi;
- else
- 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
+ - docker pull $CI_REGISTRY/caosdb/src/caosdb-deploy:$CAOSDB_TAG || CAOSDB_TAG=dev-latest ;
- docker load < /image-cache/${CPPINTTEST_IMAGE_CACHE} || true
- docker pull $CPPINTTEST_REGISTRY_IMAGE
--
GitLab