chore: Copy yml from common config repository to .gitlab-ci.yml

It was only used by VIPSCommon anyway. Also: - Use new group access token - Use oauth2 instead of root - Clone with depth 1

chore: Copy yml from common config repository to .gitlab-ci.yml
a6b731b1 · Lene Wasskog · dcc2216b · a6b731b1
Commit a6b731b1 authored 1 month ago by Lene Wasskog
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
-include:
-  - project: 'VIPS/vips-common-config'
-    file: '/gitlab-ci-vips-libraries.yml'
-    ref: main
+image: eclipse-temurin:17.0.9_9-jdk-jammy

 stages:
  - build
@@ -17,6 +14,13 @@ stages:
  - models-8

 variables:
+  COMMON_CONFIG_REMOTE: https://oauth2:$CICD_ACCESS_TOKEN@$CI_SERVER_HOST/VIPS/vips-common-config.git
+  COMMON_CONFIG_LOCAL: "vips-common-config"
+  SETTINGS_XML: "ci_settings.xml"
+  MAVEN_CLI_OPTS: "-s $SETTINGS_XML --batch-mode"
+  MAVEN_OPTS: "-Dmaven.repo.local=.m2/repository -Dmaven.artifact.threads=10"
+  MAIN_BRANCH: "main"
+  RELEASE_BRANCH: "release"
  ALTERNARIA_PROJECT_ID: "173"
  APPLESCABM_PROJECT_ID: "20"
  BARLEYNETB_PROJECT_ID: "21"
@@ -40,6 +44,102 @@ variables:
  SEPAPIICOL_PROJECT_ID: "39"
  SEPTORIAHU_PROJECT_ID: "65"
  SEPTREFHUM_PROJECT_ID: "135"
+cache:
+  paths:
+    - .m2/repository/
+
+before_script:
+  - apt-get update && apt-get install -y git
+  - git config --global user.name "${GITLAB_USER_NAME}"
+  - git config --global user.email "${GITLAB_USER_EMAIL}"
+  - echo "Get common settings"
+  - git clone --depth=1 "$COMMON_CONFIG_REMOTE" "$COMMON_CONFIG_LOCAL"
+  - cd $COMMON_CONFIG_LOCAL
+  - cp $SETTINGS_XML ../$SETTINGS_XML
+  - cd ..
+  - rm -rf $COMMON_CONFIG_LOCAL
+
+build:
+  stage: build
+  script:
+    - ./mvnw $MAVEN_CLI_OPTS $MAVEN_OPTS package
+  tags:
+    - java
+
+test:
+  stage: test
+  script:
+    - ./mvnw $MAVEN_CLI_OPTS $MAVEN_OPTS test
+  tags:
+    - java
+
+deploy-snapshot:
+  stage: deploy
+  script:
+    - export VERSION=$(./mvnw $MAVEN_CLI_OPTS $MAVEN_OPTS --batch-mode --no-transfer-progress --non-recursive help:evaluate -Dexpression=project.version | grep -v "\[.*")
+    - if ! [[ $VERSION =~ .*SNAPSHOT ]]; then
+      echo "Version '$VERSION' is not SNAPSHOT"; exit 1;
+      fi
+    - ./mvnw $MAVEN_CLI_OPTS $MAVEN_OPTS deploy -DskipTests
+    - echo "VERSION=$VERSION" >> build.env
+  artifacts:
+    reports:
+      dotenv: build.env
+  tags:
+    - java
+  rules:
+    - if: '$CI_COMMIT_REF_NAME == $MAIN_BRANCH'
+
+deploy-release:
+  stage: deploy
+  script:
+    # Use access token given by CI/CD variable CICD_ACCESS_TOKEN to authenticate
+    - export NEW_REPO_URL=https://oauth2:$CICD_ACCESS_TOKEN@$CI_SERVER_HOST/$CI_PROJECT_PATH.git
+    - git remote set-url --push origin $NEW_REPO_URL
+    - git fetch origin --prune --prune-tags
+
+    # Checkout release branch
+    - git stash -a
+    - git checkout $RELEASE_BRANCH
+    - git reset --hard origin/$RELEASE_BRANCH
+    - git stash pop
+
+    # Set release version and deploy. Commit, tag and push.
+    - ./mvnw $MAVEN_CLI_OPTS $MAVEN_OPTS validate -DremoveSnapshot
+    - export RELEASE_VERSION=$(./mvnw $MAVEN_CLI_OPTS $MAVEN_OPTS --batch-mode --no-transfer-progress --non-recursive help:evaluate -Dexpression=project.version | grep -v "\[.*")
+    - echo "VERSION=$RELEASE_VERSION" >> build.env
+    - export RELEASE_TAG="v${RELEASE_VERSION}"
+    - export EXISTING_TAGS=$(git ls-remote --tags origin | cut -f 2 | grep "refs/tags/$RELEASE_TAG$")
+    - if [ -n "$EXISTING_TAGS" ]; then
+      echo "Tag $RELEASE_TAG already exists"; exit 0;
+      fi
+    - ./mvnw $MAVEN_CLI_OPTS $MAVEN_OPTS deploy -DskipTests
+    - git add pom.xml
+    - git commit -m "[ci skip] Set release version ${RELEASE_VERSION}"
+    - git tag -a $RELEASE_TAG -m "Tag release ${RELEASE_TAG}"
+    - git push origin $RELEASE_TAG
+    - git push origin $RELEASE_BRANCH
+
+    # Checkout main branch
+    - git stash -a
+    - git checkout $MAIN_BRANCH
+    - git reset --hard origin/$MAIN_BRANCH
+    - git stash pop
+
+    # Merge release branch, bump patch version, push commits.
+    - git merge -m "[ci skip] Merge branch '${RELEASE_BRANCH}' into ${MAIN_BRANCH}" --no-ff $RELEASE_BRANCH
+    - ./mvnw $MAVEN_CLI_OPTS $MAVEN_OPTS validate -DbumpPatch
+    - export SNAPSHOT_VERSION=$(./mvnw $MAVEN_CLI_OPTS $MAVEN_OPTS --batch-mode --no-transfer-progress --non-recursive help:evaluate -Dexpression=project.version | grep -v "\[.*")
+    - git add pom.xml
+    - git commit -m "[ci skip] Set snapshot version ${SNAPSHOT_VERSION}"
+    - git push origin $MAIN_BRANCH
+  artifacts:
+    reports:
+      dotenv: build.env
+  tags:
+    - java
+  rules:
+    - if: '$CI_COMMIT_REF_NAME == $RELEASE_BRANCH'

 # 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.
@@ -49,7 +149,7 @@ verify_model_ALTERNARIA:
  stage: models-1
  before_script: []
  script:
-    - trigger -h gitlab.nibio.no -a "$CICD_API_TOKEN" -p "$ACCESS_TOKEN_ALTERNARIA" -t $MAIN_BRANCH $ALTERNARIA_PROJECT_ID -e VERSION=$VERSION -e PURPOSE="verify"
+    - trigger -h gitlab.nibio.no -a "$CICD_API_TOKEN" -p "$CICD_ACCESS_TOKEN" -t $MAIN_BRANCH $ALTERNARIA_PROJECT_ID -e VERSION=$VERSION -e PURPOSE="verify"
  tags:
    - java
  dependencies:
@@ -62,7 +162,7 @@ verify_model_APPLESCABM:
  stage: models-1
  before_script: []
  script:
-    - trigger -h gitlab.nibio.no -a "$CICD_API_TOKEN" -p "$ACCESS_TOKEN_APPLESCABM" -t $MAIN_BRANCH $APPLESCABM_PROJECT_ID -e VERSION=$VERSION -e PURPOSE="verify"
+    - trigger -h gitlab.nibio.no -a "$CICD_API_TOKEN" -p "$CICD_ACCESS_TOKEN" -t $MAIN_BRANCH $APPLESCABM_PROJECT_ID -e VERSION=$VERSION -e PURPOSE="verify"
  tags:
    - java
  dependencies:
@@ -75,7 +175,7 @@ verify_model_BARLEYNETB:
  stage: models-1
  before_script: []
  script:
-    - trigger -h gitlab.nibio.no -a "$CICD_API_TOKEN" -p "$ACCESS_TOKEN_BARLEYNETB" -t $MAIN_BRANCH $BARLEYNETB_PROJECT_ID -e VERSION=$VERSION -e PURPOSE="verify"
+    - trigger -h gitlab.nibio.no -a "$CICD_API_TOKEN" -p "$CICD_ACCESS_TOKEN" -t $MAIN_BRANCH $BARLEYNETB_PROJECT_ID -e VERSION=$VERSION -e PURPOSE="verify"
  tags:
    - java
  dependencies:
@@ -88,7 +188,7 @@ verify_model_BREMIALACT:
  stage: models-2
  before_script: []
  script:
-    - trigger -h gitlab.nibio.no -a "$CICD_API_TOKEN" -p "$ACCESS_TOKEN_BREMIALACT" -t $MAIN_BRANCH $BREMIALACT_PROJECT_ID -e VERSION=$VERSION -e PURPOSE="verify"
+    - trigger -h gitlab.nibio.no -a "$CICD_API_TOKEN" -p "$CICD_ACCESS_TOKEN" -t $MAIN_BRANCH $BREMIALACT_PROJECT_ID -e VERSION=$VERSION -e PURPOSE="verify"
  tags:
    - java
  dependencies:
@@ -101,7 +201,7 @@ verify_model_DELIARADIC:
  stage: models-2
  before_script: []
  script:
-    - trigger -h gitlab.nibio.no -a "$CICD_API_TOKEN" -p "$ACCESS_TOKEN_DELIARADIC" -t $MAIN_BRANCH $DELIARADIC_PROJECT_ID -e VERSION=$VERSION -e PURPOSE="verify"
+    - trigger -h gitlab.nibio.no -a "$CICD_API_TOKEN" -p "$CICD_ACCESS_TOKEN" -t $MAIN_BRANCH $DELIARADIC_PROJECT_ID -e VERSION=$VERSION -e PURPOSE="verify"
  tags:
    - java
  dependencies:
@@ -114,7 +214,7 @@ verify_model_DELIARFOBS:
  stage: models-2
  before_script: []
  script:
-    - trigger -h gitlab.nibio.no -a "$CICD_API_TOKEN" -p "$ACCESS_TOKEN_DELIARFOBS" -t $MAIN_BRANCH $DELIARFOBS_PROJECT_ID -e VERSION=$VERSION -e PURPOSE="verify"
+    - trigger -h gitlab.nibio.no -a "$CICD_API_TOKEN" -p "$CICD_ACCESS_TOKEN" -t $MAIN_BRANCH $DELIARFOBS_PROJECT_ID -e VERSION=$VERSION -e PURPOSE="verify"
  tags:
    - java
  dependencies:
@@ -127,7 +227,7 @@ verify_model_DOWNCASTMO:
  stage: models-3
  before_script: []
  script:
-    - trigger -h gitlab.nibio.no -a "$CICD_API_TOKEN" -p "$ACCESS_TOKEN_DOWNCASTMO" -t $MAIN_BRANCH $DOWNCASTMO_PROJECT_ID -e VERSION=$VERSION -e PURPOSE="verify"
+    - trigger -h gitlab.nibio.no -a "$CICD_API_TOKEN" -p "$CICD_ACCESS_TOKEN" -t $MAIN_BRANCH $DOWNCASTMO_PROJECT_ID -e VERSION=$VERSION -e PURPOSE="verify"
  tags:
    - java
  dependencies:
@@ -140,7 +240,7 @@ verify_model_FAWMODEL01:
  stage: models-3
  before_script: []
  script:
-    - trigger -h gitlab.nibio.no -a "$CICD_API_TOKEN" -p "$ACCESS_TOKEN_FAWMODEL01" -t $MAIN_BRANCH $FAWMODEL01_PROJECT_ID -e VERSION=$VERSION -e PURPOSE="verify"
+    - trigger -h gitlab.nibio.no -a "$CICD_API_TOKEN" -p "$CICD_ACCESS_TOKEN" -t $MAIN_BRANCH $FAWMODEL01_PROJECT_ID -e VERSION=$VERSION -e PURPOSE="verify"
  tags:
    - java
  dependencies:
@@ -153,7 +253,7 @@ verify_model_FINNCEREAL:
  stage: models-3
  before_script: []
  script:
-    - trigger -h gitlab.nibio.no -a "$CICD_API_TOKEN" -p "$ACCESS_TOKEN_FINNCEREAL" -t $MAIN_BRANCH $FINNCEREAL_PROJECT_ID -e VERSION=$VERSION -e PURPOSE="verify"
+    - trigger -h gitlab.nibio.no -a "$CICD_API_TOKEN" -p "$CICD_ACCESS_TOKEN" -t $MAIN_BRANCH $FINNCEREAL_PROJECT_ID -e VERSION=$VERSION -e PURPOSE="verify"
  tags:
    - java
  dependencies:
@@ -166,7 +266,7 @@ verify_model_GRASSDRYMO:
  stage: models-4
  before_script: []
  script:
-    - trigger -h gitlab.nibio.no -a "$CICD_API_TOKEN" -p "$ACCESS_TOKEN_GRASSDRYMO" -t $MAIN_BRANCH $GRASSDRYMO_PROJECT_ID -e VERSION=$VERSION -e PURPOSE="verify"
+    - trigger -h gitlab.nibio.no -a "$CICD_API_TOKEN" -p "$CICD_ACCESS_TOKEN" -t $MAIN_BRANCH $GRASSDRYMO_PROJECT_ID -e VERSION=$VERSION -e PURPOSE="verify"
  tags:
    - java
  dependencies:
@@ -179,7 +279,7 @@ verify_model_LEAFBLOTCH:
  stage: models-4
  before_script: []
  script:
-    - trigger -h gitlab.nibio.no -a "$CICD_API_TOKEN" -p "$ACCESS_TOKEN_LEAFBLOTCH" -t $MAIN_BRANCH $LEAFBLOTCH_PROJECT_ID -e VERSION=$VERSION -e PURPOSE="verify"
+    - trigger -h gitlab.nibio.no -a "$CICD_API_TOKEN" -p "$CICD_ACCESS_TOKEN" -t $MAIN_BRANCH $LEAFBLOTCH_PROJECT_ID -e VERSION=$VERSION -e PURPOSE="verify"
  tags:
    - java
  dependencies:
@@ -192,7 +292,7 @@ verify_model_LYGUSRUGUL:
  stage: models-4
  before_script: []
  script:
-    - trigger -h gitlab.nibio.no -a "$CICD_API_TOKEN" -p "$ACCESS_TOKEN_LYGUSRUGUL" -t $MAIN_BRANCH $LYGUSRUGUL_PROJECT_ID -e VERSION=$VERSION -e PURPOSE="verify"
+    - trigger -h gitlab.nibio.no -a "$CICD_API_TOKEN" -p "$CICD_ACCESS_TOKEN" -t $MAIN_BRANCH $LYGUSRUGUL_PROJECT_ID -e VERSION=$VERSION -e PURPOSE="verify"
  tags:
    - java
  dependencies:
@@ -205,7 +305,7 @@ verify_model_MAIZEPHENO:
  stage: models-5
  before_script: []
  script:
-    - trigger -h gitlab.nibio.no -a "$CICD_API_TOKEN" -p "$ACCESS_TOKEN_MAIZEPHENO" -t $MAIN_BRANCH $MAIZEPHENO_PROJECT_ID -e VERSION=$VERSION -e PURPOSE="verify"
+    - trigger -h gitlab.nibio.no -a "$CICD_API_TOKEN" -p "$CICD_ACCESS_TOKEN" -t $MAIN_BRANCH $MAIZEPHENO_PROJECT_ID -e VERSION=$VERSION -e PURPOSE="verify"
  tags:
    - java
  dependencies:
@@ -218,7 +318,7 @@ verify_model_MAMESTRABR:
  stage: models-5
  before_script: []
  script:
-    - trigger -h gitlab.nibio.no -a "$CICD_API_TOKEN" -p "$ACCESS_TOKEN_MAMESTRABR" -t $MAIN_BRANCH $MAMESTRABR_PROJECT_ID -e VERSION=$VERSION -e PURPOSE="verify"
+    - trigger -h gitlab.nibio.no -a "$CICD_API_TOKEN" -p "$CICD_ACCESS_TOKEN" -t $MAIN_BRANCH $MAMESTRABR_PROJECT_ID -e VERSION=$VERSION -e PURPOSE="verify"
  tags:
    - java
  dependencies:
@@ -231,7 +331,7 @@ verify_model_NAERSTADMO:
  stage: models-5
  before_script: []
  script:
-    - trigger -h gitlab.nibio.no -a "$CICD_API_TOKEN" -p "$ACCESS_TOKEN_NAERSTADMO" -t $MAIN_BRANCH $NAERSTADMO_PROJECT_ID -e VERSION=$VERSION -e PURPOSE="verify"
+    - trigger -h gitlab.nibio.no -a "$CICD_API_TOKEN" -p "$CICD_ACCESS_TOKEN" -t $MAIN_BRANCH $NAERSTADMO_PROJECT_ID -e VERSION=$VERSION -e PURPOSE="verify"
  tags:
    - java
  dependencies:
@@ -244,7 +344,7 @@ verify_model_NEGPROGMOD:
  stage: models-6
  before_script: []
  script:
-    - trigger -h gitlab.nibio.no -a "$CICD_API_TOKEN" -p "$ACCESS_TOKEN_NEGPROGMOD" -t $MAIN_BRANCH $NEGPROGMOD_PROJECT_ID -e VERSION=$VERSION -e PURPOSE="verify"
+    - trigger -h gitlab.nibio.no -a "$CICD_API_TOKEN" -p "$CICD_ACCESS_TOKEN" -t $MAIN_BRANCH $NEGPROGMOD_PROJECT_ID -e VERSION=$VERSION -e PURPOSE="verify"
  tags:
    - java
  dependencies:
@@ -257,7 +357,7 @@ verify_model_OATFLOWERM:
  stage: models-6
  before_script: []
  script:
-    - trigger -h gitlab.nibio.no -a "$CICD_API_TOKEN" -p "$ACCESS_TOKEN_OATFLOWERM" -t $MAIN_BRANCH $OATFLOWERM_PROJECT_ID -e VERSION=$VERSION -e PURPOSE="verify"
+    - trigger -h gitlab.nibio.no -a "$CICD_API_TOKEN" -p "$CICD_ACCESS_TOKEN" -t $MAIN_BRANCH $OATFLOWERM_PROJECT_ID -e VERSION=$VERSION -e PURPOSE="verify"
  tags:
    - java
  dependencies:
@@ -270,7 +370,7 @@ verify_model_PSILAROBSE:
  stage: models-6
  before_script: []
  script:
-    - trigger -h gitlab.nibio.no -a "$CICD_API_TOKEN" -p "$ACCESS_TOKEN_PSILAROBSE" -t $MAIN_BRANCH $PSILAROBSE_PROJECT_ID -e VERSION=$VERSION -e PURPOSE="verify"
+    - trigger -h gitlab.nibio.no -a "$CICD_API_TOKEN" -p "$CICD_ACCESS_TOKEN" -t $MAIN_BRANCH $PSILAROBSE_PROJECT_ID -e VERSION=$VERSION -e PURPOSE="verify"
  tags:
    - java
  dependencies:
@@ -283,7 +383,7 @@ verify_model_PSILARTEMP:
  stage: models-7
  before_script: []
  script:
-    - trigger -h gitlab.nibio.no -a "$CICD_API_TOKEN" -p "$ACCESS_TOKEN_PSILARTEMP" -t $MAIN_BRANCH $PSILARTEMP_PROJECT_ID -e VERSION=$VERSION -e PURPOSE="verify"
+    - trigger -h gitlab.nibio.no -a "$CICD_API_TOKEN" -p "$CICD_ACCESS_TOKEN" -t $MAIN_BRANCH $PSILARTEMP_PROJECT_ID -e VERSION=$VERSION -e PURPOSE="verify"
  tags:
    - java
  dependencies:
@@ -296,7 +396,7 @@ verify_model_ROUGHAGENU:
  stage: models-7
  before_script: []
  script:
-    - trigger -h gitlab.nibio.no -a "$CICD_API_TOKEN" -p "$ACCESS_TOKEN_ROUGHAGENU" -t $MAIN_BRANCH $ROUGHAGENU_PROJECT_ID -e VERSION=$VERSION -e PURPOSE="verify"
+    - trigger -h gitlab.nibio.no -a "$CICD_API_TOKEN" -p "$CICD_ACCESS_TOKEN" -t $MAIN_BRANCH $ROUGHAGENU_PROJECT_ID -e VERSION=$VERSION -e PURPOSE="verify"
  tags:
    - java
  dependencies:
@@ -309,7 +409,7 @@ verify_model_SEPAPIICOL:
  stage: models-7
  before_script: []
  script:
-    - trigger -h gitlab.nibio.no -a "$CICD_API_TOKEN" -p "$ACCESS_TOKEN_SEPAPIICOL" -t $MAIN_BRANCH $SEPAPIICOL_PROJECT_ID -e VERSION=$VERSION -e PURPOSE="verify"
+    - trigger -h gitlab.nibio.no -a "$CICD_API_TOKEN" -p "$CICD_ACCESS_TOKEN" -t $MAIN_BRANCH $SEPAPIICOL_PROJECT_ID -e VERSION=$VERSION -e PURPOSE="verify"
  tags:
    - java
  dependencies:
@@ -322,7 +422,7 @@ verify_model_SEPTORIAHU:
  stage: models-8
  before_script: []
  script:
-    - trigger -h gitlab.nibio.no -a "$CICD_API_TOKEN" -p "$ACCESS_TOKEN_SEPTORIAHU" -t $MAIN_BRANCH $SEPTORIAHU_PROJECT_ID -e VERSION=$VERSION -e PURPOSE="verify"
+    - trigger -h gitlab.nibio.no -a "$CICD_API_TOKEN" -p "$CICD_ACCESS_TOKEN" -t $MAIN_BRANCH $SEPTORIAHU_PROJECT_ID -e VERSION=$VERSION -e PURPOSE="verify"
  tags:
    - java
  dependencies:
@@ -335,7 +435,7 @@ verify_model_SEPTREFHUM:
  stage: models-8
  before_script: []
  script:
-    - trigger -h gitlab.nibio.no -a "$CICD_API_TOKEN" -p "$ACCESS_TOKEN_SEPTREFHUM" -t $MAIN_BRANCH $SEPTREFHUM_PROJECT_ID -e VERSION=$VERSION -e PURPOSE="verify"
+    - trigger -h gitlab.nibio.no -a "$CICD_API_TOKEN" -p "$CICD_ACCESS_TOKEN" -t $MAIN_BRANCH $SEPTREFHUM_PROJECT_ID -e VERSION=$VERSION -e PURPOSE="verify"
  tags:
    - java
  dependencies:
@@ -351,7 +451,7 @@ update_model_ALTERNARIA:
  stage: models-1
  before_script: []
  script:
-    - trigger -h gitlab.nibio.no -a "$CICD_API_TOKEN" -p "$ACCESS_TOKEN_ALTERNARIA" -t $MAIN_BRANCH $ALTERNARIA_PROJECT_ID -e VERSION=$VERSION -e PURPOSE="update"
+    - trigger -h gitlab.nibio.no -a "$CICD_API_TOKEN" -p "$CICD_ACCESS_TOKEN" -t $MAIN_BRANCH $ALTERNARIA_PROJECT_ID -e VERSION=$VERSION -e PURPOSE="update"
  tags:
    - java
  dependencies:
@@ -364,7 +464,7 @@ update_model_APPLESCABM:
  stage: models-1
  before_script: []
  script:
-    - trigger -h gitlab.nibio.no -a "$CICD_API_TOKEN" -p "$ACCESS_TOKEN_APPLESCABM" -t $MAIN_BRANCH $APPLESCABM_PROJECT_ID -e VERSION=$VERSION -e PURPOSE="update"
+    - trigger -h gitlab.nibio.no -a "$CICD_API_TOKEN" -p "$CICD_ACCESS_TOKEN" -t $MAIN_BRANCH $APPLESCABM_PROJECT_ID -e VERSION=$VERSION -e PURPOSE="update"
  tags:
    - java
  dependencies:
@@ -377,7 +477,7 @@ update_model_BARLEYNETB:
  stage: models-1
  before_script: []
  script:
-    - trigger -h gitlab.nibio.no -a "$CICD_API_TOKEN" -p "$ACCESS_TOKEN_BARLEYNETB" -t $MAIN_BRANCH $BARLEYNETB_PROJECT_ID -e VERSION=$VERSION -e PURPOSE="update"
+    - trigger -h gitlab.nibio.no -a "$CICD_API_TOKEN" -p "$CICD_ACCESS_TOKEN" -t $MAIN_BRANCH $BARLEYNETB_PROJECT_ID -e VERSION=$VERSION -e PURPOSE="update"
  tags:
    - java
  dependencies:
@@ -390,7 +490,7 @@ update_model_BREMIALACT:
  stage: models-2
  before_script: []
  script:
-    - trigger -h gitlab.nibio.no -a "$CICD_API_TOKEN" -p "$ACCESS_TOKEN_BREMIALACT" -t $MAIN_BRANCH $BREMIALACT_PROJECT_ID -e VERSION=$VERSION -e PURPOSE="update"
+    - trigger -h gitlab.nibio.no -a "$CICD_API_TOKEN" -p "$CICD_ACCESS_TOKEN" -t $MAIN_BRANCH $BREMIALACT_PROJECT_ID -e VERSION=$VERSION -e PURPOSE="update"
  tags:
    - java
  dependencies:
@@ -403,7 +503,7 @@ update_model_DELIARADIC:
  stage: models-2
  before_script: []
  script:
-    - trigger -h gitlab.nibio.no -a "$CICD_API_TOKEN" -p "$ACCESS_TOKEN_DELIARADIC" -t $MAIN_BRANCH $DELIARADIC_PROJECT_ID -e VERSION=$VERSION -e PURPOSE="update"
+    - trigger -h gitlab.nibio.no -a "$CICD_API_TOKEN" -p "$CICD_ACCESS_TOKEN" -t $MAIN_BRANCH $DELIARADIC_PROJECT_ID -e VERSION=$VERSION -e PURPOSE="update"
  tags:
    - java
  dependencies:
@@ -416,7 +516,7 @@ update_model_DELIARFOBS:
  stage: models-2
  before_script: []
  script:
-    - trigger -h gitlab.nibio.no -a "$CICD_API_TOKEN" -p "$ACCESS_TOKEN_DELIARFOBS" -t $MAIN_BRANCH $DELIARFOBS_PROJECT_ID -e VERSION=$VERSION -e PURPOSE="update"
+    - trigger -h gitlab.nibio.no -a "$CICD_API_TOKEN" -p "$CICD_ACCESS_TOKEN" -t $MAIN_BRANCH $DELIARFOBS_PROJECT_ID -e VERSION=$VERSION -e PURPOSE="update"
  tags:
    - java
  dependencies:
@@ -429,7 +529,7 @@ update_model_DOWNCASTMO:
  stage: models-3
  before_script: []
  script:
-    - trigger -h gitlab.nibio.no -a "$CICD_API_TOKEN" -p "$ACCESS_TOKEN_DOWNCASTMO" -t $MAIN_BRANCH $DOWNCASTMO_PROJECT_ID -e VERSION=$VERSION -e PURPOSE="update"
+    - trigger -h gitlab.nibio.no -a "$CICD_API_TOKEN" -p "$CICD_ACCESS_TOKEN" -t $MAIN_BRANCH $DOWNCASTMO_PROJECT_ID -e VERSION=$VERSION -e PURPOSE="update"
  tags:
    - java
  dependencies:
@@ -442,7 +542,7 @@ update_model_FAWMODEL01:
  stage: models-3
  before_script: []
  script:
-    - trigger -h gitlab.nibio.no -a "$CICD_API_TOKEN" -p "$ACCESS_TOKEN_FAWMODEL01" -t $MAIN_BRANCH $FAWMODEL01_PROJECT_ID -e VERSION=$VERSION -e PURPOSE="update"
+    - trigger -h gitlab.nibio.no -a "$CICD_API_TOKEN" -p "$CICD_ACCESS_TOKEN" -t $MAIN_BRANCH $FAWMODEL01_PROJECT_ID -e VERSION=$VERSION -e PURPOSE="update"
  tags:
    - java
  dependencies:
@@ -455,7 +555,7 @@ update_model_FINNCEREAL:
  stage: models-3
  before_script: []
  script:
-    - trigger -h gitlab.nibio.no -a "$CICD_API_TOKEN" -p "$ACCESS_TOKEN_FINNCEREAL" -t $MAIN_BRANCH $FINNCEREAL_PROJECT_ID -e VERSION=$VERSION -e PURPOSE="update"
+    - trigger -h gitlab.nibio.no -a "$CICD_API_TOKEN" -p "$CICD_ACCESS_TOKEN" -t $MAIN_BRANCH $FINNCEREAL_PROJECT_ID -e VERSION=$VERSION -e PURPOSE="update"
  tags:
    - java
  dependencies:
@@ -468,7 +568,7 @@ update_model_GRASSDRYMO:
  stage: models-4
  before_script: []
  script:
-    - trigger -h gitlab.nibio.no -a "$CICD_API_TOKEN" -p "$ACCESS_TOKEN_GRASSDRYMO" -t $MAIN_BRANCH $GRASSDRYMO_PROJECT_ID -e VERSION=$VERSION -e PURPOSE="update"
+    - trigger -h gitlab.nibio.no -a "$CICD_API_TOKEN" -p "$CICD_ACCESS_TOKEN" -t $MAIN_BRANCH $GRASSDRYMO_PROJECT_ID -e VERSION=$VERSION -e PURPOSE="update"
  tags:
    - java
  dependencies:
@@ -481,7 +581,7 @@ update_model_LEAFBLOTCH:
  stage: models-4
  before_script: []
  script:
-    - trigger -h gitlab.nibio.no -a "$CICD_API_TOKEN" -p "$ACCESS_TOKEN_LEAFBLOTCH" -t $MAIN_BRANCH $LEAFBLOTCH_PROJECT_ID -e VERSION=$VERSION -e PURPOSE="update"
+    - trigger -h gitlab.nibio.no -a "$CICD_API_TOKEN" -p "$CICD_ACCESS_TOKEN" -t $MAIN_BRANCH $LEAFBLOTCH_PROJECT_ID -e VERSION=$VERSION -e PURPOSE="update"
  tags:
    - java
  dependencies:
@@ -494,7 +594,7 @@ update_model_LYGUSRUGUL:
  stage: models-4
  before_script: []
  script:
-    - trigger -h gitlab.nibio.no -a "$CICD_API_TOKEN" -p "$ACCESS_TOKEN_LYGUSRUGUL" -t $MAIN_BRANCH $LYGUSRUGUL_PROJECT_ID -e VERSION=$VERSION -e PURPOSE="update"
+    - trigger -h gitlab.nibio.no -a "$CICD_API_TOKEN" -p "$CICD_ACCESS_TOKEN" -t $MAIN_BRANCH $LYGUSRUGUL_PROJECT_ID -e VERSION=$VERSION -e PURPOSE="update"
  tags:
    - java
  dependencies:
@@ -507,7 +607,7 @@ update_model_MAIZEPHENO:
  stage: models-5
  before_script: []
  script:
-    - trigger -h gitlab.nibio.no -a "$CICD_API_TOKEN" -p "$ACCESS_TOKEN_MAIZEPHENO" -t $MAIN_BRANCH $MAIZEPHENO_PROJECT_ID -e VERSION=$VERSION -e PURPOSE="update"
+    - trigger -h gitlab.nibio.no -a "$CICD_API_TOKEN" -p "$CICD_ACCESS_TOKEN" -t $MAIN_BRANCH $MAIZEPHENO_PROJECT_ID -e VERSION=$VERSION -e PURPOSE="update"
  tags:
    - java
  dependencies:
@@ -520,7 +620,7 @@ update_model_MAMESTRABR:
  stage: models-5
  before_script: []
  script:
-    - trigger -h gitlab.nibio.no -a "$CICD_API_TOKEN" -p "$ACCESS_TOKEN_MAMESTRABR" -t $MAIN_BRANCH $MAMESTRABR_PROJECT_ID -e VERSION=$VERSION -e PURPOSE="update"
+    - trigger -h gitlab.nibio.no -a "$CICD_API_TOKEN" -p "$CICD_ACCESS_TOKEN" -t $MAIN_BRANCH $MAMESTRABR_PROJECT_ID -e VERSION=$VERSION -e PURPOSE="update"
  tags:
    - java
  dependencies:
@@ -533,7 +633,7 @@ update_model_NAERSTADMO:
  stage: models-5
  before_script: []
  script:
-    - trigger -h gitlab.nibio.no -a "$CICD_API_TOKEN" -p "$ACCESS_TOKEN_NAERSTADMO" -t $MAIN_BRANCH $NAERSTADMO_PROJECT_ID -e VERSION=$VERSION -e PURPOSE="update"
+    - trigger -h gitlab.nibio.no -a "$CICD_API_TOKEN" -p "$CICD_ACCESS_TOKEN" -t $MAIN_BRANCH $NAERSTADMO_PROJECT_ID -e VERSION=$VERSION -e PURPOSE="update"
  tags:
    - java
  dependencies:
@@ -546,7 +646,7 @@ update_model_NEGPROGMOD:
  stage: models-6
  before_script: []
  script:
-    - trigger -h gitlab.nibio.no -a "$CICD_API_TOKEN" -p "$ACCESS_TOKEN_NEGPROGMOD" -t $MAIN_BRANCH $NEGPROGMOD_PROJECT_ID -e VERSION=$VERSION -e PURPOSE="update"
+    - trigger -h gitlab.nibio.no -a "$CICD_API_TOKEN" -p "$CICD_ACCESS_TOKEN" -t $MAIN_BRANCH $NEGPROGMOD_PROJECT_ID -e VERSION=$VERSION -e PURPOSE="update"
  tags:
    - java
  dependencies:
@@ -559,7 +659,7 @@ update_model_OATFLOWERM:
  stage: models-6
  before_script: []
  script:
-    - trigger -h gitlab.nibio.no -a "$CICD_API_TOKEN" -p "$ACCESS_TOKEN_OATFLOWERM" -t $MAIN_BRANCH $OATFLOWERM_PROJECT_ID -e VERSION=$VERSION -e PURPOSE="update"
+    - trigger -h gitlab.nibio.no -a "$CICD_API_TOKEN" -p "$CICD_ACCESS_TOKEN" -t $MAIN_BRANCH $OATFLOWERM_PROJECT_ID -e VERSION=$VERSION -e PURPOSE="update"
  tags:
    - java
  dependencies:
@@ -572,7 +672,7 @@ update_model_PSILAROBSE:
  stage: models-6
  before_script: []
  script:
-    - trigger -h gitlab.nibio.no -a "$CICD_API_TOKEN" -p "$ACCESS_TOKEN_PSILAROBSE" -t $MAIN_BRANCH $PSILAROBSE_PROJECT_ID -e VERSION=$VERSION -e PURPOSE="update"
+    - trigger -h gitlab.nibio.no -a "$CICD_API_TOKEN" -p "$CICD_ACCESS_TOKEN" -t $MAIN_BRANCH $PSILAROBSE_PROJECT_ID -e VERSION=$VERSION -e PURPOSE="update"
  tags:
    - java
  dependencies:
@@ -585,7 +685,7 @@ update_model_PSILARTEMP:
  stage: models-7
  before_script: []
  script:
-    - trigger -h gitlab.nibio.no -a "$CICD_API_TOKEN" -p "$ACCESS_TOKEN_PSILARTEMP" -t $MAIN_BRANCH $PSILARTEMP_PROJECT_ID -e VERSION=$VERSION -e PURPOSE="update"
+    - trigger -h gitlab.nibio.no -a "$CICD_API_TOKEN" -p "$CICD_ACCESS_TOKEN" -t $MAIN_BRANCH $PSILARTEMP_PROJECT_ID -e VERSION=$VERSION -e PURPOSE="update"
  tags:
    - java
  dependencies:
@@ -598,7 +698,7 @@ update_model_ROUGHAGENU:
  stage: models-7
  before_script: []
  script:
-    - trigger -h gitlab.nibio.no -a "$CICD_API_TOKEN" -p "$ACCESS_TOKEN_ROUGHAGENU" -t $MAIN_BRANCH $ROUGHAGENU_PROJECT_ID -e VERSION=$VERSION -e PURPOSE="update"
+    - trigger -h gitlab.nibio.no -a "$CICD_API_TOKEN" -p "$CICD_ACCESS_TOKEN" -t $MAIN_BRANCH $ROUGHAGENU_PROJECT_ID -e VERSION=$VERSION -e PURPOSE="update"
  tags:
    - java
  dependencies:
@@ -611,7 +711,7 @@ update_model_SEPAPIICOL:
  stage: models-7
  before_script: []
  script:
-    - trigger -h gitlab.nibio.no -a "$CICD_API_TOKEN" -p "$ACCESS_TOKEN_SEPAPIICOL" -t $MAIN_BRANCH $SEPAPIICOL_PROJECT_ID -e VERSION=$VERSION -e PURPOSE="update"
+    - trigger -h gitlab.nibio.no -a "$CICD_API_TOKEN" -p "$CICD_ACCESS_TOKEN" -t $MAIN_BRANCH $SEPAPIICOL_PROJECT_ID -e VERSION=$VERSION -e PURPOSE="update"
  tags:
    - java
  dependencies:
@@ -624,7 +724,7 @@ update_model_SEPTORIAHU:
  stage: models-8
  before_script: []
  script:
-    - trigger -h gitlab.nibio.no -a "$CICD_API_TOKEN" -p "$ACCESS_TOKEN_SEPTORIAHU" -t $MAIN_BRANCH $SEPTORIAHU_PROJECT_ID -e VERSION=$VERSION -e PURPOSE="update"
+    - trigger -h gitlab.nibio.no -a "$CICD_API_TOKEN" -p "$CICD_ACCESS_TOKEN" -t $MAIN_BRANCH $SEPTORIAHU_PROJECT_ID -e VERSION=$VERSION -e PURPOSE="update"
  tags:
    - java
  dependencies:
@@ -637,10 +737,10 @@ update_model_SEPTREFHUM:
  stage: models-8
  before_script: []
  script:
-    - trigger -h gitlab.nibio.no -a "$CICD_API_TOKEN" -p "$ACCESS_TOKEN_SEPTREFHUM" -t $MAIN_BRANCH $SEPTREFHUM_PROJECT_ID -e VERSION=$VERSION -e PURPOSE="update"
+    - trigger -h gitlab.nibio.no -a "$CICD_API_TOKEN" -p "$CICD_ACCESS_TOKEN" -t $MAIN_BRANCH $SEPTREFHUM_PROJECT_ID -e VERSION=$VERSION -e PURPOSE="update"
  tags:
    - java
  dependencies:
    - deploy-release
  rules:
-    - if: '$CI_COMMIT_REF_NAME == $RELEASE_BRANCH'
\ No newline at end of file
+    - if: '$CI_COMMIT_REF_NAME == $RELEASE_BRANCH'