Skip to content

Commit

Permalink
Woptim/shared ci 2023 08 0 (LLNL#502)
Browse files Browse the repository at this point in the history
* Update Shared CI and RSC

* Bump Spack version

* Update RSC to main
  • Loading branch information
adrienbernede authored Aug 30, 2023
1 parent e7fa3d0 commit 764e5b6
Show file tree
Hide file tree
Showing 7 changed files with 12 additions and 12 deletions.
8 changes: 4 additions & 4 deletions .gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ variables:
BUILD_AND_TEST_CMD: "./scripts/gitlab/build-and-test.sh"
# Override the list of branch that will skip the "draft PR test".
# Add protected branches here. Defaults to "develop main master".
# ALWAYS_RUN_LIST: ""
ALWAYS_RUN_PATTERN: "^develop$|^master$|^v[0-9.]*$|^releases/$"

# We organize the build-and-test stage in sub-pipelines. Each sub-pipeline
# corresponds to a test batch on a given machine.
Expand All @@ -58,7 +58,7 @@ stages:
include:
- local: '.gitlab/custom-jobs-and-variables.yml'
- project: 'radiuss/radiuss-shared-ci'
ref: v2023.03.1
ref: v2023.08.0
file: '${CI_MACHINE}-build-and-test.yml'
- local: '.gitlab/${CI_MACHINE}-build-and-test-extra.yml'
strategy: depend
Expand All @@ -68,7 +68,7 @@ stages:
include:
# [Optional] checks preliminary to running the actual CI test
- project: 'radiuss/radiuss-shared-ci'
ref: v2023.03.1
ref: v2023.08.0
file: 'preliminary-ignore-draft-pr.yml'
# pipelines subscribed by the project
- local: .gitlab/subscribed-pipelines.yml
- local: '.gitlab/subscribed-pipelines.yml'
2 changes: 1 addition & 1 deletion .gitlab/corona-build-and-test-extra.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,5 +18,5 @@ variables:

master:
variables:
SPEC: "@master +tests"
SPEC: " +tests"
extends: .build_and_test_on_corona
2 changes: 1 addition & 1 deletion .gitlab/lassen-build-and-test-extra.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,5 +12,5 @@ variables:
## Template for extra jobs defined by the project.
master:
variables:
SPEC: "@master +tests"
SPEC: " +tests"
extends: .build_and_test_on_lassen
2 changes: 1 addition & 1 deletion .gitlab/ruby-build-and-test-extra.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,5 +12,5 @@ variables:
## Template for extra jobs defined by the project.
master:
variables:
SPEC: "@master +tests"
SPEC: " +tests"
extends: .build_and_test_on_ruby
2 changes: 1 addition & 1 deletion .gitlab/tioga-build-and-test-extra.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,5 +18,5 @@ variables:

master:
variables:
SPEC: "@master +tests %[email protected]"
SPEC: " +tests %[email protected]"
extends: .build_and_test_on_tioga
6 changes: 3 additions & 3 deletions .uberenv_config.json
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
{
"package_name" : "caliper",
"package_version" : "develop",
"package_version" : "master",
"package_source_dir" : "../..",
"package_final_phase" : "initconfig",
"spack_url": "https://github.com/spack/spack.git",
"spack_branch": "e4s-23.02",
"spack_branch": "v0.20.1",
"spack_activate" : {},
"spack_configs_path": "scripts/radiuss-spack-configs",
"spack_packages_path": "scripts/radiuss-spack-configs/packages",
"spack_concretizer": "clingo",
"spack_setup_clingo": false,
"debug": true
}
}

0 comments on commit 764e5b6

Please sign in to comment.