diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b5a40b9e8fca3739b78f3033ba758971c39ac35e..42e3f0202884fc2184d814e4b59a4e54a1920e2f 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -45,17 +45,6 @@ deploy-snapshot: # Runs after new SNAPSHOT is deployed to package registry. Triggers job on main branch in model repo, # which builds model with the new version of VIPSCommon. This pipeline fails if model build fails. -#verify_model_ALTERNARIA: -# stage: verify -# image: registry.gitlab.com/finestructure/pipeline-trigger -# script: -# - apk add --no-cache openjdk11 -# - export PROJECT_VERSION=$(./mvnw --batch-mode --no-transfer-progress --non-recursive help:evaluate -Dexpression=project.version | grep -v "\[.*") -# - trigger -h gitlab.nibio.no -a "$CICD_API_TOKEN" -p "$ACCESS_TOKEN_ALTERNARIA" -t $MAIN_BRANCH $ALTERNARIA_PROJECT_ID -e VERSION=$PROJECT_VERSION -# tags: -# - vips-java -# rules: -# - if: '$CI_COMMIT_REF_NAME == $MAIN_BRANCH' verify_model_APPLESCABM: stage: verify @@ -69,6 +58,18 @@ verify_model_APPLESCABM: rules: - if: '$CI_COMMIT_REF_NAME == $MAIN_BRANCH' +verify_model_ALTERNARIA: + stage: verify + image: registry.gitlab.com/finestructure/pipeline-trigger + script: + - apk add --no-cache openjdk11 + - export PROJECT_VERSION=$(./mvnw --batch-mode --no-transfer-progress --non-recursive help:evaluate -Dexpression=project.version | grep -v "\[.*") + - trigger -h gitlab.nibio.no -a "$CICD_API_TOKEN" -p "$ACCESS_TOKEN_ALTERNARIA" -t $MAIN_BRANCH $ALTERNARIA_PROJECT_ID -e VERSION=$PROJECT_VERSION + tags: + - vips-java + rules: + - if: '$CI_COMMIT_REF_NAME == $MAIN_BRANCH' + verify_model_MAMESTRABR: stage: verify image: registry.gitlab.com/finestructure/pipeline-trigger