Skip to content

Commit 908d8de

Browse files
committed
always run CI tests on RL8 and RL9
1 parent b4fb789 commit 908d8de

File tree

1 file changed

+1
-23
lines changed

1 file changed

+1
-23
lines changed

.github/workflows/stackhpc.yml

Lines changed: 1 addition & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,6 @@
22
name: Test deployment and reimage on OpenStack
33
on:
44
workflow_dispatch:
5-
inputs:
6-
use_RL8:
7-
required: true
8-
description: Include RL8 tests
9-
type: boolean
10-
default: false
115
push:
126
branches:
137
- main
@@ -20,22 +14,12 @@ jobs:
2014
strategy:
2115
matrix:
2216
os_version: [RL8, RL9]
23-
rl8_selected:
24-
- ${{ inputs.use_RL8 == true }} # only potentially true for workflow_dispatch
25-
rl8_branch:
26-
- ${{ startsWith(github.head_ref, 'rl8') == true }} # only potentially for pull_request, always false on merge
27-
rl8_label:
28-
- ${{ contains(github.event.pull_request.labels.*.name, 'RL8') }} # NB: needs a new commit if added after PR created
29-
exclude:
30-
- os_version: RL8
31-
rl8_selected: false
32-
rl8_branch: false
33-
rl8_label: false
3417
env:
3518
ANSIBLE_FORCE_COLOR: True
3619
OS_CLOUD: openstack
3720
TF_VAR_cluster_name: slurmci-${{ matrix.os_version }}-${{ github.run_number }}
3821
CI_CLOUD: ${{ vars.CI_CLOUD }}
22+
TF_VAR_os_version: ${{ matrix.os_version }}
3923
steps:
4024
- uses: actions/checkout@v2
4125

@@ -89,8 +73,6 @@ jobs:
8973
. environments/.stackhpc/activate
9074
cd $APPLIANCES_ENVIRONMENT_ROOT/terraform
9175
terraform apply -auto-approve -var-file="${{ vars.CI_CLOUD }}.tfvars"
92-
env:
93-
TF_VAR_os_version: ${{ matrix.os_version }}
9476
9577
- name: Delete infrastructure if provisioning failed
9678
run: |
@@ -99,8 +81,6 @@ jobs:
9981
cd $APPLIANCES_ENVIRONMENT_ROOT/terraform
10082
terraform destroy -auto-approve -var-file="${{ vars.CI_CLOUD }}.tfvars"
10183
if: failure() && steps.provision_servers.outcome == 'failure'
102-
env:
103-
TF_VAR_os_version: ${{ matrix.os_version }}
10484

10585
- name: Configure cluster
10686
run: |
@@ -199,8 +179,6 @@ jobs:
199179
cd $APPLIANCES_ENVIRONMENT_ROOT/terraform
200180
terraform destroy -auto-approve -var-file="${{ vars.CI_CLOUD }}.tfvars"
201181
if: ${{ success() || cancelled() }}
202-
env:
203-
TF_VAR_os_version: ${{ matrix.os_version }}
204182

205183
# - name: Delete images
206184
# run: |

0 commit comments

Comments
 (0)