Skip to content

Commit db12c55

Browse files
MaxBed4dMaxBed4d
committed
Replace variables with env vars
1 parent 87b9ffa commit db12c55

7 files changed

+27
-45
lines changed

‎.github/workflows/ipa-image-build.yml

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ jobs:
2929
ipa-image-build:
3030
name: Build IPA images
3131
if: github.repository == 'stackhpc/stackhpc-kayobe-config'
32+
environment: sms
3233
runs-on: arc-skc-host-image-builder-runner-sms
3334
permissions: {}
3435
steps:
@@ -99,10 +100,10 @@ jobs:
99100
ssh_public_key = "id_rsa.pub"
100101
ssh_username = "ubuntu"
101102
aio_vm_name = "skc-ipa-image-builder"
102-
aio_vm_image = "Ubuntu-22.04"
103-
aio_vm_flavor = "general.v1.small"
104-
aio_vm_network = "magnum"
105-
aio_vm_subnet = "magnum-subnet"
103+
aio_vm_image = "${{ vars.HOST_IMAGE_BUILD_IMAGE }}"
104+
aio_vm_flavor = "${{ vars.HOST_IMAGE_BUILD_FLAVOR }}"
105+
aio_vm_network = "${{ vars.HOST_IMAGE_BUILD_NETWORK }}"
106+
aio_vm_subnet = "${{ vars.HOST_IMAGE_BUILD_SUBNET }}"
106107
aio_vm_interface = "ens3"
107108
aio_vm_volume_size = 100
108109
EOF
@@ -112,7 +113,7 @@ jobs:
112113
run: terraform plan
113114
working-directory: ${{ github.workspace }}/src/kayobe-config/terraform/aio
114115
env:
115-
OS_CLOUD: "openstack"
116+
OS_CLOUD: ${{ vars.OS_CLOUD }}
116117
OS_APPLICATION_CREDENTIAL_ID: ${{ secrets.OS_APPLICATION_CREDENTIAL_ID_SMS }}
117118
OS_APPLICATION_CREDENTIAL_SECRET: ${{ secrets.OS_APPLICATION_CREDENTIAL_SECRET_SMS }}
118119

@@ -132,7 +133,7 @@ jobs:
132133
exit 1
133134
working-directory: ${{ github.workspace }}/src/kayobe-config/terraform/aio
134135
env:
135-
OS_CLOUD: "openstack"
136+
OS_CLOUD: ${{ vars.OS_CLOUD }}
136137
OS_APPLICATION_CREDENTIAL_ID: ${{ secrets.OS_APPLICATION_CREDENTIAL_ID_SMS }}
137138
OS_APPLICATION_CREDENTIAL_SECRET: ${{ secrets.OS_APPLICATION_CREDENTIAL_SECRET_SMS }}
138139

‎.github/workflows/overcloud-host-image-build.yml

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ jobs:
2929
overcloud-host-image-build:
3030
name: Build overcloud host images
3131
if: github.repository == 'stackhpc/stackhpc-kayobe-config'
32+
environment: sms
3233
runs-on: arc-skc-host-image-builder-runner-sms
3334
permissions: {}
3435
steps:
@@ -109,10 +110,10 @@ jobs:
109110
aio_vm_name = "skc-host-image-builder"
110111
# Must be an Ubuntu Jammy host to successfully build all images
111112
# This MUST NOT be an LVM image. It can cause confusing conficts with the built image.
112-
aio_vm_image = "Ubuntu-22.04"
113-
aio_vm_flavor = "general.v1.small"
114-
aio_vm_network = "magnum"
115-
aio_vm_subnet = "magnum-subnet"
113+
aio_vm_image = "${{ vars.HOST_IMAGE_BUILD_IMAGE }}"
114+
aio_vm_flavor = "${{ vars.HOST_IMAGE_BUILD_FLAVOR }}"
115+
aio_vm_network = "${{ vars.HOST_IMAGE_BUILD_NETWORK }}"
116+
aio_vm_subnet = "${{ vars.HOST_IMAGE_BUILD_SUBNET }}"
116117
aio_vm_interface = "ens3"
117118
EOF
118119
working-directory: ${{ github.workspace }}/src/kayobe-config/terraform/aio
@@ -121,7 +122,7 @@ jobs:
121122
run: terraform plan
122123
working-directory: ${{ github.workspace }}/src/kayobe-config/terraform/aio
123124
env:
124-
OS_CLOUD: "openstack"
125+
OS_CLOUD: ${{ vars.OS_CLOUD }}
125126
OS_APPLICATION_CREDENTIAL_ID: ${{ secrets.OS_APPLICATION_CREDENTIAL_ID_SMS }}
126127
OS_APPLICATION_CREDENTIAL_SECRET: ${{ secrets.OS_APPLICATION_CREDENTIAL_SECRET_SMS }}
127128

@@ -141,7 +142,7 @@ jobs:
141142
exit 1
142143
working-directory: ${{ github.workspace }}/src/kayobe-config/terraform/aio
143144
env:
144-
OS_CLOUD: "openstack"
145+
OS_CLOUD: ${{ vars.OS_CLOUD }}
145146
OS_APPLICATION_CREDENTIAL_ID: ${{ secrets.OS_APPLICATION_CREDENTIAL_ID_SMS }}
146147
OS_APPLICATION_CREDENTIAL_SECRET: ${{ secrets.OS_APPLICATION_CREDENTIAL_SECRET_SMS }}
147148

‎.github/workflows/overcloud-host-image-upload.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ jobs:
3131
overcloud-host-image-upload:
3232
name: Upload overcloud host images
3333
if: github.repository == 'stackhpc/stackhpc-kayobe-config'
34+
environment: sms
3435
runs-on: arc-skc-host-image-builder-runner
3536
permissions: {}
3637
steps:

‎.github/workflows/package-build-ofed.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ jobs:
2525
overcloud-ofed-packages:
2626
name: Build OFED packages
2727
if: github.repository == 'stackhpc/stackhpc-kayobe-config'
28+
environment: sms
2829
runs-on: arc-skc-host-image-builder-runner-sms
2930
permissions: {}
3031
steps:
@@ -113,7 +114,7 @@ jobs:
113114
run: terraform plan
114115
working-directory: ${{ github.workspace }}/src/kayobe-config/terraform/aio
115116
env:
116-
OS_CLOUD: "openstack"
117+
OS_CLOUD: ${{ vars.OS_CLOUD }}
117118
OS_APPLICATION_CREDENTIAL_ID: ${{ secrets.OS_APPLICATION_CREDENTIAL_ID_SMS }}
118119
OS_APPLICATION_CREDENTIAL_SECRET: ${{ secrets.OS_APPLICATION_CREDENTIAL_SECRET_SMS }}
119120

@@ -133,7 +134,7 @@ jobs:
133134
exit 1
134135
working-directory: ${{ github.workspace }}/src/kayobe-config/terraform/aio
135136
env:
136-
OS_CLOUD: "openstack"
137+
OS_CLOUD: ${{ vars.OS_CLOUD }}
137138
OS_APPLICATION_CREDENTIAL_ID: ${{ secrets.OS_APPLICATION_CREDENTIAL_ID_SMS }}
138139
OS_APPLICATION_CREDENTIAL_SECRET: ${{ secrets.OS_APPLICATION_CREDENTIAL_SECRET_SMS }}
139140

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

Lines changed: 6 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -40,22 +40,6 @@ on:
4040
description: Default network interface name
4141
type: string
4242
default: ens3
43-
vm_flavor:
44-
description: Flavor for the all-in-one VM
45-
type: string
46-
default: en1.medium
47-
vm_network:
48-
description: Network for the all-in-one VM
49-
type: string
50-
default: stackhpc-ci
51-
vm_subnet:
52-
description: Subnet for the all-in-one VM
53-
type: string
54-
default: stackhpc-ci
55-
OS_CLOUD:
56-
description: Name of cloud in clouds.yaml
57-
type: string
58-
required: true
5943
if:
6044
description: Whether to run the workflow (workaround for required status checks issue)
6145
type: boolean
@@ -181,9 +165,9 @@ jobs:
181165
SSH_USERNAME: "${{ inputs.ssh_username }}"
182166
VM_NAME: "skc-ci-aio-${{ inputs.neutron_plugin }}-${{ github.run_id }}"
183167
VM_IMAGE: ${{ steps.image_name.outputs.image_name }}
184-
VM_FLAVOR: ${{ inputs.vm_flavor }}
185-
VM_NETWORK: ${{ inputs.vm_network }}
186-
VM_SUBNET: ${{ inputs.vm_subnet }}
168+
VM_FLAVOR: ${{ vars.AIO_FLAVOR }}
169+
VM_NETWORK: ${{ vars.AIO_NETWORK }}
170+
VM_SUBNET: ${{ vars.AIO_SUBNET }}
187171
VM_INTERFACE: ${{ inputs.vm_interface }}
188172
VM_VOLUME_SIZE: ${{ inputs.upgrade && '65' || '50' }}
189173
VM_TAGS: '["skc-ci-aio", "PR=${{ github.event.number }}"]'
@@ -192,7 +176,7 @@ jobs:
192176
run: terraform plan
193177
working-directory: ${{ github.workspace }}/terraform/aio
194178
env:
195-
OS_CLOUD: ${{ inputs.OS_CLOUD }}
179+
OS_CLOUD: ${{ vars.OS_CLOUD }}
196180
OS_APPLICATION_CREDENTIAL_ID: ${{ secrets.OS_APPLICATION_CREDENTIAL_ID }}
197181
OS_APPLICATION_CREDENTIAL_SECRET: ${{ secrets.OS_APPLICATION_CREDENTIAL_SECRET }}
198182

@@ -213,7 +197,7 @@ jobs:
213197
exit 1
214198
working-directory: ${{ github.workspace }}/terraform/aio
215199
env:
216-
OS_CLOUD: ${{ inputs.OS_CLOUD }}
200+
OS_CLOUD: ${{ vars.OS_CLOUD }}
217201
OS_APPLICATION_CREDENTIAL_ID: ${{ secrets.OS_APPLICATION_CREDENTIAL_ID }}
218202
OS_APPLICATION_CREDENTIAL_SECRET: ${{ secrets.OS_APPLICATION_CREDENTIAL_SECRET }}
219203

@@ -511,7 +495,7 @@ jobs:
511495
run: terraform destroy -auto-approve
512496
working-directory: ${{ github.workspace }}/terraform/aio
513497
env:
514-
OS_CLOUD: ${{ inputs.OS_CLOUD }}
498+
OS_CLOUD: ${{ vars.OS_CLOUD }}
515499
OS_APPLICATION_CREDENTIAL_ID: ${{ secrets.OS_APPLICATION_CREDENTIAL_ID }}
516500
OS_APPLICATION_CREDENTIAL_SECRET: ${{ secrets.OS_APPLICATION_CREDENTIAL_SECRET }}
517501
if: always()

‎.github/workflows/stackhpc-ci-cleanup.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ jobs:
5252
done
5353
exit $result
5454
env:
55-
OS_CLOUD: openstack
55+
OS_CLOUD: ${{ vars.OS_CLOUD }}
5656
OS_APPLICATION_CREDENTIAL_ID: ${{ secrets.OS_APPLICATION_CREDENTIAL_ID }}
5757
OS_APPLICATION_CREDENTIAL_SECRET: ${{ secrets.OS_APPLICATION_CREDENTIAL_SECRET }}
5858

@@ -72,7 +72,7 @@ jobs:
7272
done
7373
exit $result
7474
env:
75-
OS_CLOUD: openstack
75+
OS_CLOUD: ${{ vars.OS_CLOUD }}
7676
OS_APPLICATION_CREDENTIAL_ID: ${{ secrets.OS_APPLICATION_CREDENTIAL_ID }}
7777
OS_APPLICATION_CREDENTIAL_SECRET: ${{ secrets.OS_APPLICATION_CREDENTIAL_SECRET }}
7878

@@ -92,7 +92,7 @@ jobs:
9292
done
9393
exit $result
9494
env:
95-
OS_CLOUD: openstack
95+
OS_CLOUD: ${{ vars.OS_CLOUD }}
9696
OS_APPLICATION_CREDENTIAL_ID: ${{ secrets.OS_APPLICATION_CREDENTIAL_ID }}
9797
OS_APPLICATION_CREDENTIAL_SECRET: ${{ secrets.OS_APPLICATION_CREDENTIAL_SECRET }}
9898

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

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,6 @@ jobs:
139139
os_release: jammy
140140
ssh_username: ubuntu
141141
neutron_plugin: ovs
142-
OS_CLOUD: openstack
143142
if: ${{ needs.check-changes.outputs.aio == 'true' }}
144143
secrets: inherit
145144
if: ${{ ! failure() && ! cancelled() && github.repository == 'stackhpc/stackhpc-kayobe-config' }}
@@ -156,7 +155,6 @@ jobs:
156155
os_release: jammy
157156
ssh_username: ubuntu
158157
neutron_plugin: ovn
159-
OS_CLOUD: openstack
160158
if: ${{ needs.check-changes.outputs.aio == 'true' }}
161159
secrets: inherit
162160
if: ${{ ! failure() && ! cancelled() && github.repository == 'stackhpc/stackhpc-kayobe-config' }}
@@ -173,7 +171,6 @@ jobs:
173171
os_release: "9"
174172
ssh_username: cloud-user
175173
neutron_plugin: ovs
176-
OS_CLOUD: openstack
177174
if: ${{ needs.check-changes.outputs.aio == 'true' }}
178175
secrets: inherit
179176
if: ${{ ! failure() && ! cancelled() && github.repository == 'stackhpc/stackhpc-kayobe-config' }}
@@ -190,7 +187,6 @@ jobs:
190187
os_release: "9"
191188
ssh_username: cloud-user
192189
neutron_plugin: ovn
193-
OS_CLOUD: openstack
194190
if: ${{ needs.check-changes.outputs.aio == 'true' }}
195191
secrets: inherit
196192
if: ${{ ! failure() && ! cancelled() && github.repository == 'stackhpc/stackhpc-kayobe-config' }}
@@ -209,7 +205,6 @@ jobs:
209205
os_release: jammy
210206
ssh_username: ubuntu
211207
neutron_plugin: ovs
212-
OS_CLOUD: openstack
213208
if: ${{ needs.check-changes.outputs.aio == 'true' }}
214209
upgrade: true
215210
secrets: inherit
@@ -227,7 +222,6 @@ jobs:
227222
os_release: "9"
228223
ssh_username: cloud-user
229224
neutron_plugin: ovn
230-
OS_CLOUD: openstack
231225
if: ${{ needs.check-changes.outputs.aio == 'true' }}
232226
upgrade: true
233227
secrets: inherit

0 commit comments

Comments
 (0)