Skip to content

Commit 5922bfa

Browse files
MaxBed4dMaxBed4d
committed
Make Amphora image build env runner compatible
1 parent 173b631 commit 5922bfa

File tree

4 files changed

+49
-34
lines changed

4 files changed

+49
-34
lines changed

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

Lines changed: 22 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,14 @@
22
name: Build Amphora image
33
on:
44
workflow_dispatch:
5+
inputs:
6+
runner_env:
7+
description: Which cloud to run on?
8+
type: choice
9+
default: SMS Lab
10+
options:
11+
- SMS Lab
12+
- Leafcloud
513
secrets:
614
KAYOBE_VAULT_PASSWORD:
715
required: true
@@ -17,10 +25,17 @@ env:
1725
KAYOBE_ENVIRONMENT: ci-builder
1826
KAYOBE_VAULT_PASSWORD: ${{ secrets.KAYOBE_VAULT_PASSWORD }}
1927
jobs:
28+
runner-preqs:
29+
uses: ./.github/workflows/runs-on-preq.yml
30+
with:
31+
runner_env: ${{ inputs.runner_env }}
2032
amphora-image-build:
2133
name: Build Amphora image
2234
if: github.repository == 'stackhpc/stackhpc-kayobe-config'
23-
runs-on: arc-skc-host-image-builder-runner
35+
environment: ${{ inputs.runner_env }}
36+
runs-on: ${{ needs.runner-preqs.outputs.runner_name_image_build }}
37+
needs:
38+
- runner-preqs
2439
permissions: {}
2540
steps:
2641

@@ -90,10 +105,10 @@ jobs:
90105
aio_vm_name = "skc-amphora-image-builder"
91106
# Must be an Ubuntu Jammy host to successfully build all images
92107
# This MUST NOT be an LVM image. It can cause confusing conficts with the built image.
93-
aio_vm_image = "Ubuntu-22.04"
94-
aio_vm_flavor = "en1.medium"
95-
aio_vm_network = "stackhpc-ci"
96-
aio_vm_subnet = "stackhpc-ci"
108+
aio_vm_image = "${{ vars.HOST_IMAGE_BUILD_IMAGE }}"
109+
aio_vm_flavor = "${{ vars.HOST_IMAGE_BUILD_FLAVOR }}"
110+
aio_vm_network = "${{ vars.HOST_IMAGE_BUILD_NETWORK }}"
111+
aio_vm_subnet = "${{ vars.HOST_IMAGE_BUILD_SUBNET }}"
97112
aio_vm_interface = "ens3"
98113
EOF
99114
working-directory: ${{ github.workspace }}/src/kayobe-config/terraform/aio
@@ -122,7 +137,7 @@ jobs:
122137
exit 1
123138
working-directory: ${{ github.workspace }}/src/kayobe-config/terraform/aio
124139
env:
125-
OS_CLOUD: "openstack"
140+
OS_CLOUD: ${{ vars.OS_CLOUD }}
126141
OS_APPLICATION_CREDENTIAL_ID: ${{ secrets.OS_APPLICATION_CREDENTIAL_ID }}
127142
OS_APPLICATION_CREDENTIAL_SECRET: ${{ secrets.OS_APPLICATION_CREDENTIAL_SECRET }}
128143

@@ -250,7 +265,7 @@ jobs:
250265
run: terraform destroy -auto-approve
251266
working-directory: ${{ github.workspace }}/src/kayobe-config/terraform/aio
252267
env:
253-
OS_CLOUD: openstack
268+
OS_CLOUD: ${{ vars.OS_CLOUD }}
254269
OS_APPLICATION_CREDENTIAL_ID: ${{ secrets.OS_APPLICATION_CREDENTIAL_ID }}
255270
OS_APPLICATION_CREDENTIAL_SECRET: ${{ secrets.OS_APPLICATION_CREDENTIAL_SECRET }}
256271
if: always()

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ jobs:
103103
- name: Generate clouds.yaml
104104
run: |
105105
cat << EOF > clouds.yaml
106-
${{ secrets.CLOUDS_YAML_SMS }}
106+
${{ secrets.CLOUDS_YAML }}
107107
EOF
108108
working-directory: ${{ github.workspace }}/src/kayobe-config/terraform/aio
109109

@@ -127,8 +127,8 @@ jobs:
127127
working-directory: ${{ github.workspace }}/src/kayobe-config/terraform/aio
128128
env:
129129
OS_CLOUD: ${{ vars.OS_CLOUD }}
130-
OS_APPLICATION_CREDENTIAL_ID: ${{ secrets.OS_APPLICATION_CREDENTIAL_ID_SMS }}
131-
OS_APPLICATION_CREDENTIAL_SECRET: ${{ secrets.OS_APPLICATION_CREDENTIAL_SECRET_SMS }}
130+
OS_APPLICATION_CREDENTIAL_ID: ${{ secrets.OS_APPLICATION_CREDENTIAL_ID }}
131+
OS_APPLICATION_CREDENTIAL_SECRET: ${{ secrets.OS_APPLICATION_CREDENTIAL_SECRET }}
132132

133133
- name: Terraform Apply
134134
run: |
@@ -147,8 +147,8 @@ jobs:
147147
working-directory: ${{ github.workspace }}/src/kayobe-config/terraform/aio
148148
env:
149149
OS_CLOUD: ${{ vars.OS_CLOUD }}
150-
OS_APPLICATION_CREDENTIAL_ID: ${{ secrets.OS_APPLICATION_CREDENTIAL_ID_SMS }}
151-
OS_APPLICATION_CREDENTIAL_SECRET: ${{ secrets.OS_APPLICATION_CREDENTIAL_SECRET_SMS }}
150+
OS_APPLICATION_CREDENTIAL_ID: ${{ secrets.OS_APPLICATION_CREDENTIAL_ID }}
151+
OS_APPLICATION_CREDENTIAL_SECRET: ${{ secrets.OS_APPLICATION_CREDENTIAL_SECRET }}
152152

153153
- name: Get Terraform outputs
154154
id: tf_outputs
@@ -354,6 +354,6 @@ jobs:
354354
working-directory: ${{ github.workspace }}/src/kayobe-config/terraform/aio
355355
env:
356356
OS_CLOUD: openstack
357-
OS_APPLICATION_CREDENTIAL_ID: ${{ secrets.OS_APPLICATION_CREDENTIAL_ID_SMS }}
358-
OS_APPLICATION_CREDENTIAL_SECRET: ${{ secrets.OS_APPLICATION_CREDENTIAL_SECRET_SMS }}
357+
OS_APPLICATION_CREDENTIAL_ID: ${{ secrets.OS_APPLICATION_CREDENTIAL_ID }}
358+
OS_APPLICATION_CREDENTIAL_SECRET: ${{ secrets.OS_APPLICATION_CREDENTIAL_SECRET }}
359359
if: always()

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

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ jobs:
111111
- name: Generate clouds.yaml
112112
run: |
113113
cat << EOF > clouds.yaml
114-
${{ secrets.CLOUDS_YAML_SMS }}
114+
${{ secrets.CLOUDS_YAML }}
115115
EOF
116116
working-directory: ${{ github.workspace }}/src/kayobe-config/terraform/aio
117117

@@ -136,8 +136,8 @@ jobs:
136136
working-directory: ${{ github.workspace }}/src/kayobe-config/terraform/aio
137137
env:
138138
OS_CLOUD: ${{ vars.OS_CLOUD }}
139-
OS_APPLICATION_CREDENTIAL_ID: ${{ secrets.OS_APPLICATION_CREDENTIAL_ID_SMS }}
140-
OS_APPLICATION_CREDENTIAL_SECRET: ${{ secrets.OS_APPLICATION_CREDENTIAL_SECRET_SMS }}
139+
OS_APPLICATION_CREDENTIAL_ID: ${{ secrets.OS_APPLICATION_CREDENTIAL_ID }}
140+
OS_APPLICATION_CREDENTIAL_SECRET: ${{ secrets.OS_APPLICATION_CREDENTIAL_SECRET }}
141141

142142
- name: Terraform Apply
143143
run: |
@@ -156,8 +156,8 @@ jobs:
156156
working-directory: ${{ github.workspace }}/src/kayobe-config/terraform/aio
157157
env:
158158
OS_CLOUD: ${{ vars.OS_CLOUD }}
159-
OS_APPLICATION_CREDENTIAL_ID: ${{ secrets.OS_APPLICATION_CREDENTIAL_ID_SMS }}
160-
OS_APPLICATION_CREDENTIAL_SECRET: ${{ secrets.OS_APPLICATION_CREDENTIAL_SECRET_SMS }}
159+
OS_APPLICATION_CREDENTIAL_ID: ${{ secrets.OS_APPLICATION_CREDENTIAL_ID }}
160+
OS_APPLICATION_CREDENTIAL_SECRET: ${{ secrets.OS_APPLICATION_CREDENTIAL_SECRET }}
161161

162162
- name: Get Terraform outputs
163163
id: tf_outputs
@@ -273,9 +273,9 @@ jobs:
273273
-e local_image_path="/opt/kayobe/images/overcloud-rocky-9/overcloud-rocky-9.qcow2" \
274274
-e image_name=overcloud-rocky-9-${{ steps.host_image_tag.outputs.host_image_tag }}
275275
env:
276-
CLOUDS_YAML: ${{ secrets.CLOUDS_YAML_SMS }}
277-
OS_APPLICATION_CREDENTIAL_ID: ${{ secrets.OS_APPLICATION_CREDENTIAL_ID_SMS }}
278-
OS_APPLICATION_CREDENTIAL_SECRET: ${{ secrets.OS_APPLICATION_CREDENTIAL_SECRET_SMS }}
276+
CLOUDS_YAML: ${{ secrets.CLOUDS_YAML }}
277+
OS_APPLICATION_CREDENTIAL_ID: ${{ secrets.OS_APPLICATION_CREDENTIAL_ID }}
278+
OS_APPLICATION_CREDENTIAL_SECRET: ${{ secrets.OS_APPLICATION_CREDENTIAL_SECRET }}
279279
if: inputs.rocky9 && steps.build_rocky_9.outcome == 'success'
280280

281281
- name: Build an Ubuntu Jammy 22.04 overcloud host image
@@ -327,9 +327,9 @@ jobs:
327327
-e local_image_path="/opt/kayobe/images/overcloud-ubuntu-jammy/overcloud-ubuntu-jammy.qcow2" \
328328
-e image_name=overcloud-ubuntu-jammy-${{ steps.host_image_tag.outputs.host_image_tag }}
329329
env:
330-
CLOUDS_YAML: ${{ secrets.CLOUDS_YAML_SMS }}
331-
OS_APPLICATION_CREDENTIAL_ID: ${{ secrets.OS_APPLICATION_CREDENTIAL_ID_SMS }}
332-
OS_APPLICATION_CREDENTIAL_SECRET: ${{ secrets.OS_APPLICATION_CREDENTIAL_SECRET_SMS }}
330+
CLOUDS_YAML: ${{ secrets.CLOUDS_YAML }}
331+
OS_APPLICATION_CREDENTIAL_ID: ${{ secrets.OS_APPLICATION_CREDENTIAL_ID }}
332+
OS_APPLICATION_CREDENTIAL_SECRET: ${{ secrets.OS_APPLICATION_CREDENTIAL_SECRET }}
333333
if: inputs.ubuntu-jammy && steps.build_ubuntu_jammy.outcome == 'success'
334334

335335
- name: Copy logs back
@@ -359,6 +359,6 @@ jobs:
359359
working-directory: ${{ github.workspace }}/src/kayobe-config/terraform/aio
360360
env:
361361
OS_CLOUD: openstack
362-
OS_APPLICATION_CREDENTIAL_ID: ${{ secrets.OS_APPLICATION_CREDENTIAL_ID_SMS }}
363-
OS_APPLICATION_CREDENTIAL_SECRET: ${{ secrets.OS_APPLICATION_CREDENTIAL_SECRET_SMS }}
362+
OS_APPLICATION_CREDENTIAL_ID: ${{ secrets.OS_APPLICATION_CREDENTIAL_ID }}
363+
OS_APPLICATION_CREDENTIAL_SECRET: ${{ secrets.OS_APPLICATION_CREDENTIAL_SECRET }}
364364
if: always()

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ jobs:
9292
- name: Generate clouds.yaml
9393
run: |
9494
cat << EOF > clouds.yaml
95-
${{ secrets.CLOUDS_YAML_SMS }}
95+
${{ secrets.CLOUDS_YAML }}
9696
EOF
9797
working-directory: ${{ github.workspace }}/src/kayobe-config/terraform/aio
9898

@@ -128,8 +128,8 @@ jobs:
128128
working-directory: ${{ github.workspace }}/src/kayobe-config/terraform/aio
129129
env:
130130
OS_CLOUD: ${{ vars.OS_CLOUD }}
131-
OS_APPLICATION_CREDENTIAL_ID: ${{ secrets.OS_APPLICATION_CREDENTIAL_ID_SMS }}
132-
OS_APPLICATION_CREDENTIAL_SECRET: ${{ secrets.OS_APPLICATION_CREDENTIAL_SECRET_SMS }}
131+
OS_APPLICATION_CREDENTIAL_ID: ${{ secrets.OS_APPLICATION_CREDENTIAL_ID }}
132+
OS_APPLICATION_CREDENTIAL_SECRET: ${{ secrets.OS_APPLICATION_CREDENTIAL_SECRET }}
133133

134134
- name: Terraform Apply
135135
run: |
@@ -148,8 +148,8 @@ jobs:
148148
working-directory: ${{ github.workspace }}/src/kayobe-config/terraform/aio
149149
env:
150150
OS_CLOUD: ${{ vars.OS_CLOUD }}
151-
OS_APPLICATION_CREDENTIAL_ID: ${{ secrets.OS_APPLICATION_CREDENTIAL_ID_SMS }}
152-
OS_APPLICATION_CREDENTIAL_SECRET: ${{ secrets.OS_APPLICATION_CREDENTIAL_SECRET_SMS }}
151+
OS_APPLICATION_CREDENTIAL_ID: ${{ secrets.OS_APPLICATION_CREDENTIAL_ID }}
152+
OS_APPLICATION_CREDENTIAL_SECRET: ${{ secrets.OS_APPLICATION_CREDENTIAL_SECRET }}
153153

154154
- name: Get Terraform outputs
155155
id: tf_outputs
@@ -263,6 +263,6 @@ jobs:
263263
working-directory: ${{ github.workspace }}/src/kayobe-config/terraform/aio
264264
env:
265265
OS_CLOUD: openstack
266-
OS_APPLICATION_CREDENTIAL_ID: ${{ secrets.OS_APPLICATION_CREDENTIAL_ID_SMS }}
267-
OS_APPLICATION_CREDENTIAL_SECRET: ${{ secrets.OS_APPLICATION_CREDENTIAL_SECRET_SMS }}
266+
OS_APPLICATION_CREDENTIAL_ID: ${{ secrets.OS_APPLICATION_CREDENTIAL_ID }}
267+
OS_APPLICATION_CREDENTIAL_SECRET: ${{ secrets.OS_APPLICATION_CREDENTIAL_SECRET }}
268268
if: always()

0 commit comments

Comments
 (0)