Skip to content

Commit 1eb06e7

Browse files
committed
CI: Better handling of machine outage
1 parent bf59c27 commit 1eb06e7

2 files changed

Lines changed: 44 additions & 3 deletions

File tree

.gitlab-ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ stages:
7676
include:
7777
- local: '.gitlab/custom-jobs-and-variables.yml'
7878
- project: 'radiuss/radiuss-shared-ci'
79-
ref: 'v2025.06.0'
79+
ref: 'v2025.09.0'
8080
file: 'pipelines/${CI_MACHINE}.yml'
8181
- artifact: '${CI_MACHINE}-jobs.yml'
8282
job: 'generate-job-lists'
@@ -90,7 +90,7 @@ include:
9090
file: 'id_tokens.yml'
9191
# [Optional] checks preliminary to running the actual CI test
9292
- project: 'radiuss/radiuss-shared-ci'
93-
ref: 'v2025.06.0'
93+
ref: 'v2025.09.0'
9494
file: 'utilities/preliminary-ignore-draft-pr.yml'
9595
# pipelines subscribed by the project
9696
- local: '.gitlab/subscribed-pipelines.yml'

.gitlab/subscribed-pipelines.yml

Lines changed: 42 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,64 +50,105 @@ generate-job-lists:
5050
- tioga-jobs.yml
5151
- tuolumne-jobs.yml
5252

53-
5453
# DANE
5554
dane-up-check:
5655
variables:
5756
CI_MACHINE: "dane"
5857
extends: [.machine-check]
58+
rules:
59+
# Runs except if we explicitly deactivate dane by variable.
60+
- if: '$ON_DANE == "OFF"'
61+
when: never
62+
- when: on_success
5963

6064
dane-build-and-test:
6165
variables:
6266
CI_MACHINE: "dane"
6367
needs: [dane-up-check, generate-job-lists]
6468
extends: [.build-and-test]
69+
rules:
70+
# Runs except if we explicitly deactivate dane by variable.
71+
- if: '$ON_DANE == "OFF"'
72+
when: never
73+
- when: on_success
6574

6675
# CORONA
6776
corona-up-check:
6877
variables:
6978
CI_MACHINE: "corona"
7079
extends: [.machine-check]
80+
rules:
81+
- if: '$ON_CORONA == "OFF"'
82+
when: never
83+
- when: on_success
7184

7285
corona-build-and-test:
7386
variables:
7487
CI_MACHINE: "corona"
7588
needs: [corona-up-check, generate-job-lists]
7689
extends: [.build-and-test]
90+
rules:
91+
- if: '$ON_CORONA == "OFF"'
92+
when: never
93+
- when: on_success
7794

7895
# TIOGA
7996
tioga-up-check:
8097
variables:
8198
CI_MACHINE: "tioga"
8299
extends: [.machine-check]
100+
rules:
101+
- if: '$ON_TIOGA == "OFF"'
102+
when: never
103+
- when: on_success
83104

84105
tioga-build-and-test:
85106
variables:
86107
CI_MACHINE: "tioga"
87108
needs: [tioga-up-check, generate-job-lists]
88109
extends: [.build-and-test]
110+
rules:
111+
- if: '$ON_TIOGA == "OFF"'
112+
when: never
113+
- when: on_success
89114

90115
# TUOLUMNE
91116
tuolumne-up-check:
92117
variables:
93118
CI_MACHINE: "tuolumne"
94119
extends: [.machine-check]
120+
rules:
121+
- if: '$ON_TUOLUMNE == "OFF"'
122+
when: never
123+
- when: on_success
95124

96125
tuolumne-build-and-test:
97126
variables:
98127
CI_MACHINE: "tuolumne"
99128
needs: [tuolumne-up-check, generate-job-lists]
100129
extends: [.build-and-test]
130+
rules:
131+
- if: '$ON_TUOLUMNE == "OFF"'
132+
when: never
133+
- when: on_success
101134

102135
# LASSEN
103136
lassen-up-check:
104137
variables:
105138
CI_MACHINE: "lassen"
106139
extends: [.machine-check]
140+
rules:
141+
- if: '$ON_LASSEN == "OFF"'
142+
when: never
143+
- when: on_success
107144

108145
lassen-build-and-test:
109146
variables:
110147
CI_MACHINE: "lassen"
111148
needs: [lassen-up-check, generate-job-lists]
112149
extends: [.build-and-test]
150+
rules:
151+
- if: '$ON_LASSEN == "OFF"'
152+
when: never
153+
- when: on_success
113154

0 commit comments

Comments
 (0)