From 53d548917b730df28fb8884c658bae8395c66bf0 Mon Sep 17 00:00:00 2001 From: Whitney Armstrong Date: Tue, 1 Jul 2025 13:30:09 -0500 Subject: [PATCH 1/6] Included the "RGL" gitlab CI in the main --- .gitlab-ci.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 389b327123..e7080f3032 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -81,6 +81,8 @@ docs: paths: - pages +include: '.gitlab-rgl.yml' + #deploy: # stage: deploy-stage # dependencies: [docs,jacoco,depana] From 9aa0226df32928b65b57642b449ce4b3a003b43b Mon Sep 17 00:00:00 2001 From: Whitney Armstrong Date: Tue, 1 Jul 2025 13:44:38 -0500 Subject: [PATCH 2/6] modified: .gitlab-ci.yml modified: .gitlab-rgl.yml --- .gitlab-ci.yml | 11 +++++++++++ .gitlab-rgl.yml | 7 ------- 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index e7080f3032..a0f52f4a69 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -9,12 +9,23 @@ workflow: - if: $CI_COMMIT_TAG auto_cancel: on_new_commit: conservative + - if: '$CI_PIPELINE_SOURCE == "web"' + auto_cancel: + on_new_commit: interruptible + - if: '$CI_PIPELINE_SOURCE == "webide"' + auto_cancel: + on_new_commit: interruptible + - if: '$CI_COMMIT_BRANCH == "development"' + auto_cancel: + on_new_commit: conservative + default: interruptible: true before_script: # FIXME: build minimal el9 container, or use container-forge - dnf install -y java-21-openjdk maven wget tree ruby python3-pip + retry: 2 stages: - build-stage diff --git a/.gitlab-rgl.yml b/.gitlab-rgl.yml index f704055f1c..00e1197ed8 100644 --- a/.gitlab-rgl.yml +++ b/.gitlab-rgl.yml @@ -7,13 +7,6 @@ workflow: - if: '$CI_COMMIT_BRANCH == "development"' - if: '$CI_COMMIT_TAG' -variables: - KUBERNETES_MEMORY_LIMIT: "8Gi" - REF_NAME: ${CI_COMMIT_REF_NAME} - -default: - image: ubuntu:noble - retry: 2 coatjava_build: image: gcr.io/kaniko-project/executor:debug From d7dfe7a03817c412300a554e152e67bb3ea1e272 Mon Sep 17 00:00:00 2001 From: Whitney Armstrong Date: Tue, 1 Jul 2025 13:44:50 -0500 Subject: [PATCH 3/6] modified: .gitlab-rgl.yml --- .gitlab-rgl.yml | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/.gitlab-rgl.yml b/.gitlab-rgl.yml index 00e1197ed8..ab4de3348d 100644 --- a/.gitlab-rgl.yml +++ b/.gitlab-rgl.yml @@ -1,13 +1,3 @@ -workflow: - rules: - - if: '$CI_PIPELINE_SOURCE == "merge_request_event"' - - if: '$CI_PIPELINE_SOURCE == "web"' - - if: '$CI_PIPELINE_SOURCE == "webide"' - - if: '$CI_COMMIT_BRANCH == "master"' - - if: '$CI_COMMIT_BRANCH == "development"' - - if: '$CI_COMMIT_TAG' - - coatjava_build: image: gcr.io/kaniko-project/executor:debug script: From c4485faa8f919c79ead2b56dae600395b98fba88 Mon Sep 17 00:00:00 2001 From: Whitney Armstrong Date: Tue, 1 Jul 2025 14:01:08 -0500 Subject: [PATCH 4/6] modified: .gitlab-rgl.yml --- .gitlab-rgl.yml | 31 +++++++++++++++++++------------ 1 file changed, 19 insertions(+), 12 deletions(-) diff --git a/.gitlab-rgl.yml b/.gitlab-rgl.yml index ab4de3348d..51f5544bd1 100644 --- a/.gitlab-rgl.yml +++ b/.gitlab-rgl.yml @@ -1,4 +1,5 @@ coatjava_build: + stage: build-stage image: gcr.io/kaniko-project/executor:debug script: - echo "${CI_COMMIT_REF_NAME}" @@ -10,6 +11,7 @@ coatjava_build: --build-arg REF_NAME=${CI_COMMIT_REF_NAME} coatjava_dind_build: + stage: build-stage image: eicweb.phy.anl.gov:4567/containers/image_recipes/ubuntu_dind:latest tags: - "silicon" @@ -26,6 +28,7 @@ coatjava_dind_build: print_help: + stage: test-stage image: $CI_REGISTRY_IMAGE/coatjava:${CI_COMMIT_REF_NAME} needs: ["coatjava_build"] script: @@ -38,6 +41,7 @@ print_help: alert_testing: + stage: test-stage needs: ["coatjava_build"] variables: REF_NAME: "$CI_COMMIT_REF_NAME" @@ -46,6 +50,7 @@ alert_testing: strategy: depend shared_for_alert_tests: + stage: test-stage needs: ["coatjava_build"] variables: REF_NAME: "$CI_COMMIT_REF_NAME" @@ -54,6 +59,7 @@ shared_for_alert_tests: strategy: depend coatjava:singularity: + stage: build-stage image: eicweb.phy.anl.gov:4567/containers/image_recipes/ubuntu_dind:latest needs: ["coatjava_build"] tags: @@ -66,16 +72,17 @@ coatjava:singularity: paths: - coatjava.sif -create-pages: - image: codecr.jlab.org/hallb/alert/coatjava/coatjava:development - script: - - echo "${CI_COMMIT_REF_NAME}" - - ls -lrth - - mvn --version - - java --version - - ls -lrth - - pwd - - ./build-coatjava.sh --docs - - mv coatjava/share/doc/coatjava/html public - pages: true # specifies that this is a Pages job and publishes the default public directory +#create-pages: +# stage: build-stage +# image: codecr.jlab.org/hallb/alert/coatjava/coatjava:development +# script: +# - echo "${CI_COMMIT_REF_NAME}" +# - ls -lrth +# - mvn --version +# - java --version +# - ls -lrth +# - pwd +# - ./build-coatjava.sh --docs +# - mv coatjava/share/doc/coatjava/html public +# pages: true # specifies that this is a Pages job and publishes the default public directory From 769e335de2c0f78d3e3e4af67a6fec08db455447 Mon Sep 17 00:00:00 2001 From: Whitney Armstrong Date: Tue, 1 Jul 2025 14:40:41 -0500 Subject: [PATCH 5/6] modified: .gitlab-ci.yml --- .gitlab-ci.yml | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a0f52f4a69..e30566f8d9 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -22,9 +22,6 @@ workflow: default: interruptible: true - before_script: - # FIXME: build minimal el9 container, or use container-forge - - dnf install -y java-21-openjdk maven wget tree ruby python3-pip retry: 2 stages: @@ -34,6 +31,9 @@ stages: build: stage: build-stage + before_script: + # FIXME: build minimal el9 container, or use container-forge + - dnf install -y java-21-openjdk maven wget tree ruby python3-pip script: - ./build-coatjava.sh -T4 --unittests --spotbugs --quiet --no-progress artifacts: @@ -46,6 +46,9 @@ depana: allow_failure: true stage: test-stage dependencies: [build] + before_script: + # FIXME: build minimal el9 container, or use container-forge + - dnf install -y java-21-openjdk maven wget tree ruby python3-pip script: - mvn dependency:tree -Ddetail=true --no-transfer-progress - mvn dependency:analyze -DfailOnWarning=true -pl '!org.jlab.coat:coat-libs' --no-transfer-progress @@ -53,6 +56,9 @@ depana: eb: stage: test-stage dependencies: [build] + before_script: + # FIXME: build minimal el9 container, or use container-forge + - dnf install -y java-21-openjdk maven wget tree ruby python3-pip script: - cd validation/advanced-tests && ./run-eb-tests.sh -100 ${ARG} parallel: @@ -68,6 +74,9 @@ jacoco: stage: test-stage needs: [build] dependencies: [build] + before_script: + # FIXME: build minimal el9 container, or use container-forge + - dnf install -y java-21-openjdk maven wget tree ruby python3-pip script: - ./validation/jacoco-aggregate.sh artifacts: @@ -80,6 +89,9 @@ docs: stage: test-stage needs: [build,jacoco] dependencies: [build,jacoco] + before_script: + # FIXME: build minimal el9 container, or use container-forge + - dnf install -y java-21-openjdk maven wget tree ruby python3-pip script: - python3 -m pip install -r docs/mkdocs/requirements.txt - ./docs/mkdocs/generate.sh pages From a5ba613977ba9ac1791e44f4a717db26b6557d57 Mon Sep 17 00:00:00 2001 From: Whitney Armstrong Date: Tue, 1 Jul 2025 14:51:22 -0500 Subject: [PATCH 6/6] modified: .gitlab-rgl.yml --- .gitlab-rgl.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-rgl.yml b/.gitlab-rgl.yml index 51f5544bd1..b5ac39dd81 100644 --- a/.gitlab-rgl.yml +++ b/.gitlab-rgl.yml @@ -66,7 +66,7 @@ coatjava:singularity: - silicon allow_failure: true script: - - apptainer build --build-arg REF_NAME=${REF_NAME} coatjava.sif .containers/coatjava.def + - apptainer build --build-arg REF_NAME=${CI_COMMIT_REF_NAME} coatjava.sif .containers/coatjava.def - ls -lrth artifacts: paths: