From d3516da683309da0e3a0ea41d9a5bc58207ff994 Mon Sep 17 00:00:00 2001 From: lewa <lene.wasskog@nibio.no> Date: Mon, 11 Sep 2023 13:10:27 +0200 Subject: [PATCH] build: Add verify steps for all remaining models --- .gitlab-ci.yml | 212 +++++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 198 insertions(+), 14 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index d2b75d5..6e84cf6 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -6,6 +6,11 @@ stages: - verify-1 - verify-2 - verify-3 + - verify-4 + - verify-5 + - verify-6 + - verify-7 + - verify-8 variables: MAVEN_CLI_OPTS: "-s ci_settings.xml --batch-mode" @@ -14,13 +19,27 @@ variables: RELEASE_BRANCH: "release" ALTERNARIA_PROJECT_ID: "173" APPLESCABM_PROJECT_ID: "20" + BARLEYNETB_PROJECT_ID: "21" + BREMIALACT_PROJECT_ID: "22" DELIARADIC_PROJECT_ID: "24" + DELIARFOBS_PROJECT_ID: "25" + DOWNCASTMO_PROJECT_ID: "26" FAWMODEL01_PROJECT_ID: "90" - NAERSTADMO_PROJECT_ID: "32" + FINNCEREAL_PROJECT_ID: "66" + GRASSDRYMO_PROJECT_ID: "28" + LEAFBLOTCH_PROJECT_ID: "294" + LYGUSRUGUL_PROJECT_ID: "30" + MAIZEPHENO_PROJECT_ID: "336" MAMESTRABR_PROJECT_ID: "31" + NAERSTADMO_PROJECT_ID: "32" + NEGPROGMOD_PROJECT_ID: "33" + OATFLOWERM_PROJECT_ID: "34" PSILARTEMP_PROJECT_ID: "37" + PSILAROBSE_PROJECT_ID: "36" + ROUGHAGENU_PROJECT_ID: "38" + SEPAPIICOL_PROJECT_ID: "39" SEPTORIAHU_PROJECT_ID: "65" - BARLEYNETB_PROJECT_ID: "21" + SEPTREFHUM_PROJECT_ID: "135" cache: paths: - .m2/repository/ @@ -53,25 +72,25 @@ 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_APPLESCABM: +verify_model_ALTERNARIA: stage: verify-1 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_APPLESCABM" -t $MAIN_BRANCH $APPLESCABM_PROJECT_ID -e VERSION=$PROJECT_VERSION + - 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_ALTERNARIA: +verify_model_APPLESCABM: stage: verify-1 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 + - trigger -h gitlab.nibio.no -a "$CICD_API_TOKEN" -p "$ACCESS_TOKEN_APPLESCABM" -t $MAIN_BRANCH $APPLESCABM_PROJECT_ID -e VERSION=$PROJECT_VERSION tags: - vips-java rules: @@ -89,6 +108,17 @@ verify_model_BARLEYNETB: rules: - if: '$CI_COMMIT_REF_NAME == $MAIN_BRANCH' +verify_model_BREMIALACT: + stage: verify-2 + 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_BREMIALACT" -t $MAIN_BRANCH $BREMIALACT_PROJECT_ID -e VERSION=$PROJECT_VERSION + tags: + - vips-java + rules: + - if: '$CI_COMMIT_REF_NAME == $MAIN_BRANCH' verify_model_DELIARADIC: stage: verify-2 @@ -102,9 +132,33 @@ verify_model_DELIARADIC: rules: - if: '$CI_COMMIT_REF_NAME == $MAIN_BRANCH' -verify_model_FAWMODEL01: +verify_model_DELIARFOBS: stage: verify-2 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_DELIARFOBS" -t $MAIN_BRANCH $DELIARFOBS_PROJECT_ID -e VERSION=$PROJECT_VERSION + tags: + - vips-java + rules: + - if: '$CI_COMMIT_REF_NAME == $MAIN_BRANCH' + +verify_model_DOWNCASTMO: + stage: verify-3 + 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_DOWNCASTMO" -t $MAIN_BRANCH $DOWNCASTMO_PROJECT_ID -e VERSION=$PROJECT_VERSION + tags: + - vips-java + rules: + - if: '$CI_COMMIT_REF_NAME == $MAIN_BRANCH' + +verify_model_FAWMODEL01: + stage: verify-3 + 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 "\[.*") @@ -114,21 +168,68 @@ verify_model_FAWMODEL01: rules: - if: '$CI_COMMIT_REF_NAME == $MAIN_BRANCH' -verify_model_NAERSTADMO: - stage: verify-2 +verify_model_FINNCEREAL: + stage: verify-3 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_NAERSTADMO" -t $MAIN_BRANCH $NAERSTADMO_PROJECT_ID -e VERSION=$PROJECT_VERSION + - trigger -h gitlab.nibio.no -a "$CICD_API_TOKEN" -p "$ACCESS_TOKEN_FINNCEREAL" -t $MAIN_BRANCH $FINNCEREAL_PROJECT_ID -e VERSION=$PROJECT_VERSION tags: - vips-java rules: - if: '$CI_COMMIT_REF_NAME == $MAIN_BRANCH' +verify_model_GRASSDRYMO: + stage: verify-4 + 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_GRASSDRYMO" -t $MAIN_BRANCH $GRASSDRYMO_PROJECT_ID -e VERSION=$PROJECT_VERSION + tags: + - vips-java + rules: + - if: '$CI_COMMIT_REF_NAME == $MAIN_BRANCH' + +verify_model_LEAFBLOTCH: + stage: verify-4 + 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_LEAFBLOTCH" -t $MAIN_BRANCH $LEAFBLOTCH_PROJECT_ID -e VERSION=$PROJECT_VERSION + tags: + - vips-java + rules: + - if: '$CI_COMMIT_REF_NAME == $MAIN_BRANCH' + +verify_model_LYGUSRUGUL: + stage: verify-4 + 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_LYGUSRUGUL" -t $MAIN_BRANCH $LYGUSRUGUL_PROJECT_ID -e VERSION=$PROJECT_VERSION + tags: + - vips-java + rules: + - if: '$CI_COMMIT_REF_NAME == $MAIN_BRANCH' + +verify_model_MAIZEPHENO: + stage: verify-5 + 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_MAIZEPHENO" -t $MAIN_BRANCH $MAIZEPHENO_PROJECT_ID -e VERSION=$PROJECT_VERSION + tags: + - vips-java + rules: + - if: '$CI_COMMIT_REF_NAME == $MAIN_BRANCH' verify_model_MAMESTRABR: - stage: verify-3 + stage: verify-5 image: registry.gitlab.com/finestructure/pipeline-trigger script: - apk add --no-cache openjdk11 @@ -139,8 +240,56 @@ verify_model_MAMESTRABR: rules: - if: '$CI_COMMIT_REF_NAME == $MAIN_BRANCH' +verify_model_NAERSTADMO: + stage: verify-5 + 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_NAERSTADMO" -t $MAIN_BRANCH $NAERSTADMO_PROJECT_ID -e VERSION=$PROJECT_VERSION + tags: + - vips-java + rules: + - if: '$CI_COMMIT_REF_NAME == $MAIN_BRANCH' + +verify_model_NEGPRODMOD: + stage: verify-6 + 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_NEGPRODMOD" -t $MAIN_BRANCH $NEGPRODMOD_PROJECT_ID -e VERSION=$PROJECT_VERSION + tags: + - vips-java + rules: + - if: '$CI_COMMIT_REF_NAME == $MAIN_BRANCH' + +verify_model_OATFLOWERM: + stage: verify-6 + 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_OATFLOWERM" -t $MAIN_BRANCH $OATFLOWERM_PROJECT_ID -e VERSION=$PROJECT_VERSION + tags: + - vips-java + rules: + - if: '$CI_COMMIT_REF_NAME == $MAIN_BRANCH' + +verify_model_PSILAROBSE: + stage: verify-6 + 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_PSILAROBSE" -t $MAIN_BRANCH $PSILAROBSE_PROJECT_ID -e VERSION=$PROJECT_VERSION + tags: + - vips-java + rules: + - if: '$CI_COMMIT_REF_NAME == $MAIN_BRANCH' + verify_model_PSILARTEMP: - stage: verify-3 + stage: verify-7 image: registry.gitlab.com/finestructure/pipeline-trigger script: - apk add --no-cache openjdk11 @@ -151,8 +300,32 @@ verify_model_PSILARTEMP: rules: - if: '$CI_COMMIT_REF_NAME == $MAIN_BRANCH' +verify_model_ROUGHAGENU: + stage: verify-7 + 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_ROUGHAGENU" -t $MAIN_BRANCH $ROUGHAGENU_PROJECT_ID -e VERSION=$PROJECT_VERSION + tags: + - vips-java + rules: + - if: '$CI_COMMIT_REF_NAME == $MAIN_BRANCH' + +verify_model_SEPAPIICOL: + stage: verify-7 + 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_SEPAPIICOL" -t $MAIN_BRANCH $SEPAPIICOL_PROJECT_ID -e VERSION=$PROJECT_VERSION + tags: + - vips-java + rules: + - if: '$CI_COMMIT_REF_NAME == $MAIN_BRANCH' + verify_model_SEPTORIAHU: - stage: verify-3 + stage: verify-8 image: registry.gitlab.com/finestructure/pipeline-trigger script: - apk add --no-cache openjdk11 @@ -163,6 +336,17 @@ verify_model_SEPTORIAHU: rules: - if: '$CI_COMMIT_REF_NAME == $MAIN_BRANCH' +verify_model_SEPTREFHUM: + stage: verify-8 + 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_SEPTREFHUM" -t $MAIN_BRANCH $SEPTREFHUM_PROJECT_ID -e VERSION=$PROJECT_VERSION + tags: + - vips-java + rules: + - if: '$CI_COMMIT_REF_NAME == $MAIN_BRANCH' deploy-release: stage: deploy @@ -201,4 +385,4 @@ deploy-release: tags: - vips-java rules: - - if: '$CI_COMMIT_REF_NAME == $RELEASE_BRANCH' + - if: '$CI_COMMIT_REF_NAME == $RELEASE_BRANCH' \ No newline at end of file -- GitLab