diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 15daf2e51d29e51b1207d19f041a606414ea2a69..5f02bc3f9674e4f6ab1258a5e96a484d45039ecf 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -58,7 +58,7 @@ stages: info: tags: [cached-dind] image: docker:20.10 - stage: setup_tests + stage: info timeout: 1 minutes needs: [] script: @@ -80,7 +80,7 @@ build-testenv: - if echo "$CI_COMMIT_REF_NAME" | grep -c "^f-" ; then # this is an f-branch CPPINT_REF=$CI_COMMIT_REF_NAME ; - fi; + fi # ... or use main if possible... - if [[ "$CI_COMMIT_REF_NAME" == "main" ]] ; then CPPINT_REF=main ; @@ -113,7 +113,7 @@ build-test: - cmake -D CMAKE_PREFIX_PATH=/usr/local/lib/libcaosdb-${CPPLIB_VERSION} .. - cmake --build . artifacts: - path: + paths: - build/ expire_in: 1 week @@ -139,27 +139,27 @@ test: # 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 ..." + 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:" ; + echo "Load deploy images with tag $CAOSDB_TAG ... error. Try another:" ; CAOSDB_TAG=${DEPLOY_REF}-latest ; - echo "Load deploy images with tag: $CAOSDB_TAG ..." + 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" + echo "Load deploy images with tag $CAOSDB_TAG ... success" fi else # no F_BRANCH -> use default DEPLOY_REF branch CAOSDB_TAG=${DEPLOY_REF}-latest ; - echo "Load deploy images with tag: $CAOSDB_TAG ..." + 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" + 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 ..." + 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" + echo "Load deploy images with tag $CAOSDB_TAG ... success" fi - docker load < /image-cache/${CPPINTTEST_IMAGE_CACHE} || true @@ -193,7 +193,6 @@ test: # exit with fail when errors exist - exit $rc - dependencies: [cert] timeout: 3h artifacts: paths: