Skip to content

Commit 5ddab7d

Browse files
authored
Merge pull request #926 from stackhpc/Enable-Job-Cancellation
Allow aio jobs to be cancelled (yoga)
2 parents 4d3356e + b3e2c56 commit 5ddab7d

File tree

2 files changed

+11
-11
lines changed

2 files changed

+11
-11
lines changed

.github/workflows/stackhpc-all-in-one.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ jobs:
6969
# NOTE: Runner needs unzip and nodejs packages.
7070
all-in-one:
7171
name: All in one
72-
if: inputs.if
72+
if: ${{ inputs.if && !cancelled() }}
7373
runs-on: arc-skc-aio-runner
7474
permissions: {}
7575
env:

.github/workflows/stackhpc-pull-request.yml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ jobs:
8888
OS_CLOUD: openstack
8989
if: ${{ needs.check-changes.outputs.aio == 'true' }}
9090
secrets: inherit
91-
if: ${{ ! failure() && github.repository == 'stackhpc/stackhpc-kayobe-config' }}
91+
if: ${{ ! failure() && ! cancelled() && github.repository == 'stackhpc/stackhpc-kayobe-config' }}
9292

9393
all-in-one-centos-ovn:
9494
name: aio (CentOS OVN)
@@ -102,7 +102,7 @@ jobs:
102102
OS_CLOUD: openstack
103103
if: ${{ needs.check-changes.outputs.aio == 'true' }}
104104
secrets: inherit
105-
if: ${{ ! failure() && github.repository == 'stackhpc/stackhpc-kayobe-config' }}
105+
if: ${{ ! failure() && ! cancelled() && github.repository == 'stackhpc/stackhpc-kayobe-config' }}
106106

107107
all-in-one-rocky-8-ovs:
108108
name: aio (Rocky OVS)
@@ -118,7 +118,7 @@ jobs:
118118
OS_CLOUD: openstack
119119
if: ${{ needs.check-changes.outputs.aio == 'true' }}
120120
secrets: inherit
121-
if: ${{ ! failure() && github.repository == 'stackhpc/stackhpc-kayobe-config' }}
121+
if: ${{ ! failure() && ! cancelled() && github.repository == 'stackhpc/stackhpc-kayobe-config' }}
122122

123123
all-in-one-rocky-8-ovn:
124124
name: aio (Rocky OVN)
@@ -134,7 +134,7 @@ jobs:
134134
OS_CLOUD: openstack
135135
if: ${{ needs.check-changes.outputs.aio == 'true' }}
136136
secrets: inherit
137-
if: ${{ ! failure() && github.repository == 'stackhpc/stackhpc-kayobe-config' }}
137+
if: ${{ ! failure() && ! cancelled() && github.repository == 'stackhpc/stackhpc-kayobe-config' }}
138138

139139
all-in-one-ubuntu-ovs:
140140
name: aio (Ubuntu OVS)
@@ -151,7 +151,7 @@ jobs:
151151
OS_CLOUD: openstack
152152
if: ${{ needs.check-changes.outputs.aio == 'true' }}
153153
secrets: inherit
154-
if: ${{ ! failure() && github.repository == 'stackhpc/stackhpc-kayobe-config' }}
154+
if: ${{ ! failure() && ! cancelled() && github.repository == 'stackhpc/stackhpc-kayobe-config' }}
155155

156156
all-in-one-ubuntu-ovn:
157157
name: aio (Ubuntu OVN)
@@ -168,7 +168,7 @@ jobs:
168168
OS_CLOUD: openstack
169169
if: ${{ needs.check-changes.outputs.aio == 'true' }}
170170
secrets: inherit
171-
if: ${{ ! failure() && github.repository == 'stackhpc/stackhpc-kayobe-config' }}
171+
if: ${{ ! failure() && ! cancelled() && github.repository == 'stackhpc/stackhpc-kayobe-config' }}
172172

173173
all-in-one-ubuntu-jammy-ovs:
174174
name: aio (Ubuntu Jammy OVS)
@@ -185,7 +185,7 @@ jobs:
185185
OS_CLOUD: openstack
186186
if: ${{ needs.check-changes.outputs.aio == 'true' }}
187187
secrets: inherit
188-
if: ${{ ! failure() && github.repository == 'stackhpc/stackhpc-kayobe-config' }}
188+
if: ${{ ! failure() && ! cancelled() && github.repository == 'stackhpc/stackhpc-kayobe-config' }}
189189

190190
all-in-one-ubuntu-jammy-ovn:
191191
name: aio (Ubuntu Jammy OVN)
@@ -202,7 +202,7 @@ jobs:
202202
OS_CLOUD: openstack
203203
if: ${{ needs.check-changes.outputs.aio == 'true' }}
204204
secrets: inherit
205-
if: ${{ ! failure() && github.repository == 'stackhpc/stackhpc-kayobe-config' }}
205+
if: ${{ ! failure() && ! cancelled() && github.repository == 'stackhpc/stackhpc-kayobe-config' }}
206206

207207
all-in-one-rocky-9-ovs:
208208
name: aio (Rocky 9 OVS)
@@ -219,7 +219,7 @@ jobs:
219219
OS_CLOUD: openstack
220220
if: ${{ needs.check-changes.outputs.aio == 'true' }}
221221
secrets: inherit
222-
if: ${{ ! failure() && github.repository == 'stackhpc/stackhpc-kayobe-config' }}
222+
if: ${{ ! failure() && ! cancelled() && github.repository == 'stackhpc/stackhpc-kayobe-config' }}
223223

224224
all-in-one-rocky-9-ovn:
225225
name: aio (Rocky 9 OVN)
@@ -236,4 +236,4 @@ jobs:
236236
OS_CLOUD: openstack
237237
if: ${{ needs.check-changes.outputs.aio == 'true' }}
238238
secrets: inherit
239-
if: ${{ ! failure() && github.repository == 'stackhpc/stackhpc-kayobe-config' }}
239+
if: ${{ ! failure() && ! cancelled() && github.repository == 'stackhpc/stackhpc-kayobe-config' }}

0 commit comments

Comments
 (0)