diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 4be376bd..595befa3 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -76,7 +76,7 @@ stages: include: - local: '.gitlab/custom-jobs-and-variables.yml' - project: 'radiuss/radiuss-shared-ci' - ref: 'v2025.06.0' + ref: 'v2025.09.0' file: 'pipelines/${CI_MACHINE}.yml' - artifact: '${CI_MACHINE}-jobs.yml' job: 'generate-job-lists' @@ -89,7 +89,7 @@ include: file: 'id_tokens.yml' # [Optional] checks preliminary to running the actual CI test #- project: 'radiuss/radiuss-shared-ci' - # ref: 'v2025.06.0' + # ref: 'v2025.09.0' # file: 'preliminary-ignore-draft-pr.yml' # pipelines subscribed by the project - local: '.gitlab/subscribed-pipelines.yml' diff --git a/.gitlab/subscribed-pipelines.yml b/.gitlab/subscribed-pipelines.yml index 2d1d9a4f..89385060 100644 --- a/.gitlab/subscribed-pipelines.yml +++ b/.gitlab/subscribed-pipelines.yml @@ -53,45 +53,79 @@ dane-up-check: variables: CI_MACHINE: "dane" extends: [.machine-check] + rules: + # Runs except if we explicitly deactivate dane by variable. + - if: '$ON_DANE == "OFF"' + when: never + - when: on_success dane-build-and-test: variables: CI_MACHINE: "dane" needs: [dane-up-check, generate-job-lists] extends: [.build-and-test] + rules: + # Runs except if we explicitly deactivate dane by variable. + - if: '$ON_DANE == "OFF"' + when: never + - when: on_success # CORONA corona-up-check: variables: CI_MACHINE: "corona" extends: [.machine-check] + rules: + - if: '$ON_CORONA == "OFF"' + when: never + - when: on_success corona-build-and-test: variables: CI_MACHINE: "corona" needs: [corona-up-check, generate-job-lists] extends: [.build-and-test] + rules: + - if: '$ON_CORONA == "OFF"' + when: never + - when: on_success # TIOGA tioga-up-check: variables: CI_MACHINE: "tioga" extends: [.machine-check] + rules: + - if: '$ON_TIOGA == "OFF"' + when: never + - when: on_success tioga-build-and-test: variables: CI_MACHINE: "tioga" needs: [tioga-up-check, generate-job-lists] extends: [.build-and-test] + rules: + - if: '$ON_TIOGA == "OFF"' + when: never + - when: on_success # TUOLUMNE tuolumne-up-check: variables: CI_MACHINE: "tuolumne" extends: [.machine-check] + rules: + - if: '$ON_TUOLUMNE == "OFF"' + when: never + - when: on_success tuolumne-build-and-test: variables: CI_MACHINE: "tuolumne" needs: [tuolumne-up-check, generate-job-lists] extends: [.build-and-test] + rules: + - if: '$ON_TUOLUMNE == "OFF"' + when: never + - when: on_success diff --git a/.uberenv_config.json b/.uberenv_config.json index 6dc61326..38485328 100644 --- a/.uberenv_config.json +++ b/.uberenv_config.json @@ -4,8 +4,8 @@ "package_final_phase" : "initconfig", "package_source_dir" : "../..", "spack_url": "https://github.com/spack/spack.git", -"spack_commit": "280017a9ba3f6a969743deca0eebc96e7c0e5cfd", +"spack_branch": "v1.0.2", "spack_configs_path": "scripts/radiuss-spack-configs", -"spack_packages_path": "scripts/radiuss-spack-configs/packages", +"spack_packages_path": "scripts/radiuss-spack-configs/spack_repo/llnl_radiuss/packages", "spack_setup_clingo": false } diff --git a/scripts/radiuss-spack-configs b/scripts/radiuss-spack-configs index dcf80758..4dac97ec 160000 --- a/scripts/radiuss-spack-configs +++ b/scripts/radiuss-spack-configs @@ -1 +1 @@ -Subproject commit dcf807584584cb1ca4dca1d5cbf8b320bf73567e +Subproject commit 4dac97ec251994e9c4f30e4eb29f5377b8956166 diff --git a/scripts/uberenv b/scripts/uberenv index 6ba67dcb..eb185358 160000 --- a/scripts/uberenv +++ b/scripts/uberenv @@ -1 +1 @@ -Subproject commit 6ba67dcbd7ccbb9c03920b89de19ac959e2c3bdd +Subproject commit eb1853586821360613f1c6c415ebf65d370a47e7