Skip to content

Commit bf14991

Browse files
Alex-WelshAlex-Welsh
committed
Use new ci-builder vault pw in workflows
1 parent b63c2f6 commit bf14991

10 files changed

Lines changed: 53 additions & 52 deletions

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ on:
1111
- SMS Lab
1212
- Leafcloud
1313
secrets:
14-
KAYOBE_VAULT_PASSWORD:
14+
KAYOBE_VAULT_PASSWORD_CI_BUILDER:
1515
required: true
1616
CLOUDS_YAML:
1717
required: true
@@ -23,7 +23,7 @@ on:
2323
env:
2424
ANSIBLE_FORCE_COLOR: True
2525
KAYOBE_ENVIRONMENT: ci-builder
26-
KAYOBE_VAULT_PASSWORD: ${{ secrets.KAYOBE_VAULT_PASSWORD }}
26+
KAYOBE_VAULT_PASSWORD: ${{ secrets.KAYOBE_VAULT_PASSWORD_CI_BUILDER }}
2727
jobs:
2828
runner-selection:
2929
uses: ./.github/workflows/runner-selector.yml
@@ -196,7 +196,7 @@ jobs:
196196
kayobe seed host command run \
197197
--command "sudo apt update && sudo apt -y install gcc git libffi-dev python3-dev python-is-python3 python3-venv" --show-output
198198
env:
199-
KAYOBE_VAULT_PASSWORD: ${{ secrets.KAYOBE_VAULT_PASSWORD }}
199+
KAYOBE_VAULT_PASSWORD: ${{ secrets.KAYOBE_VAULT_PASSWORD_CI_BUILDER }}
200200

201201
- name: Create Amphora image output directory
202202
run: |
@@ -205,7 +205,7 @@ jobs:
205205
kayobe seed host command run \
206206
--command "mkdir -p /opt/kayobe/images/amphora" --show-output
207207
env:
208-
KAYOBE_VAULT_PASSWORD: ${{ secrets.KAYOBE_VAULT_PASSWORD }}
208+
KAYOBE_VAULT_PASSWORD: ${{ secrets.KAYOBE_VAULT_PASSWORD_CI_BUILDER }}
209209

210210
- name: Build Octavia Amphora image
211211
id: build_amphora
@@ -214,7 +214,7 @@ jobs:
214214
source src/kayobe-config/kayobe-env --environment ci-builder &&
215215
kayobe playbook run src/kayobe-config/etc/kayobe/ansible/maintenance/octavia-amphora-image-build.yml -e amphora_image_dest=/opt/kayobe/images/amphora/amphora-x64-haproxy.qcow2
216216
env:
217-
KAYOBE_VAULT_PASSWORD: ${{ secrets.KAYOBE_VAULT_PASSWORD }}
217+
KAYOBE_VAULT_PASSWORD: ${{ secrets.KAYOBE_VAULT_PASSWORD_CI_BUILDER }}
218218

219219
- name: Show last error logs
220220
continue-on-error: true
@@ -223,7 +223,7 @@ jobs:
223223
source src/kayobe-config/kayobe-env --environment ci-builder &&
224224
kayobe seed host command run --command "tail -200 /var/log/octavia-amphora-image-build.log" --show-output
225225
env:
226-
KAYOBE_VAULT_PASSWORD: ${{ secrets.KAYOBE_VAULT_PASSWORD }}
226+
KAYOBE_VAULT_PASSWORD: ${{ secrets.KAYOBE_VAULT_PASSWORD_CI_BUILDER }}
227227
if: steps.build_amphora.outcome == 'failure'
228228

229229
- name: Upload Octavia Amphora image to Ark
@@ -238,7 +238,7 @@ jobs:
238238
-e repository_name="amphora-images-${{ steps.openstack_release.outputs.openstack_release }}" \
239239
-e pulp_base_path="amphora-images/${{ steps.openstack_release.outputs.openstack_release }}"
240240
env:
241-
KAYOBE_VAULT_PASSWORD: ${{ secrets.KAYOBE_VAULT_PASSWORD }}
241+
KAYOBE_VAULT_PASSWORD: ${{ secrets.KAYOBE_VAULT_PASSWORD_CI_BUILDER }}
242242
if: steps.build_amphora.outcome == 'success'
243243

244244
- name: Copy logs back to runner

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,4 +66,4 @@ jobs:
6666
-e pulp_base_path="amphora-images/${{ steps.openstack_release.outputs.openstack_release }}"
6767
env:
6868
ARTIFACT_TAG: ${{ inputs.image_tag }}
69-
KAYOBE_VAULT_PASSWORD: ${{ secrets.KAYOBE_VAULT_PASSWORD }}
69+
KAYOBE_VAULT_PASSWORD: ${{ secrets.KAYOBE_VAULT_PASSWORD_CI_BUILDER }}

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

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ on:
1919
- SMS Lab
2020
- Leafcloud
2121
secrets:
22-
KAYOBE_VAULT_PASSWORD:
22+
KAYOBE_VAULT_PASSWORD_CI_BUILDER:
2323
required: true
2424
CLOUDS_YAML:
2525
required: true
@@ -31,7 +31,7 @@ on:
3131
env:
3232
ANSIBLE_FORCE_COLOR: True
3333
KAYOBE_ENVIRONMENT: ci-builder
34-
KAYOBE_VAULT_PASSWORD: ${{ secrets.KAYOBE_VAULT_PASSWORD }}
34+
KAYOBE_VAULT_PASSWORD: ${{ secrets.KAYOBE_VAULT_PASSWORD_CI_BUILDER }}
3535
jobs:
3636
runner-selection:
3737
uses: ./.github/workflows/runner-selector.yml
@@ -196,7 +196,7 @@ jobs:
196196
-e seed_bootstrap_user=ubuntu \
197197
--skip-tags network,apt,docker,docker-registry
198198
env:
199-
KAYOBE_VAULT_PASSWORD: ${{ secrets.KAYOBE_VAULT_PASSWORD }}
199+
KAYOBE_VAULT_PASSWORD: ${{ secrets.KAYOBE_VAULT_PASSWORD_CI_BUILDER }}
200200

201201
- name: Install dependencies
202202
run: |
@@ -205,7 +205,7 @@ jobs:
205205
kayobe seed host command run \
206206
--command "sudo apt update && sudo apt -y install gcc git libffi-dev python3-dev python-is-python3 python3-venv" --show-output
207207
env:
208-
KAYOBE_VAULT_PASSWORD: ${{ secrets.KAYOBE_VAULT_PASSWORD }}
208+
KAYOBE_VAULT_PASSWORD: ${{ secrets.KAYOBE_VAULT_PASSWORD_CI_BUILDER }}
209209

210210
- name: Build a Ubuntu 24.04 Noble IPA image
211211
id: build_ubuntu_noble_ipa
@@ -219,7 +219,7 @@ jobs:
219219
-e ipa_ci_builder_distribution="ubuntu" \
220220
-e ipa_ci_builder_release="noble"
221221
env:
222-
KAYOBE_VAULT_PASSWORD: ${{ secrets.KAYOBE_VAULT_PASSWORD }}
222+
KAYOBE_VAULT_PASSWORD: ${{ secrets.KAYOBE_VAULT_PASSWORD_CI_BUILDER }}
223223
if: inputs.ubuntu-noble
224224

225225
- name: Show last error logs
@@ -229,7 +229,7 @@ jobs:
229229
source src/kayobe-config/kayobe-env --environment ci-builder &&
230230
kayobe seed host command run --command "tail -200 /opt/kayobe/images/ipa/ipa.stdout" --show-output
231231
env:
232-
KAYOBE_VAULT_PASSWORD: ${{ secrets.KAYOBE_VAULT_PASSWORD }}
232+
KAYOBE_VAULT_PASSWORD: ${{ secrets.KAYOBE_VAULT_PASSWORD_CI_BUILDER }}
233233
if: steps.build_ubuntu_noble_ipa.outcome == 'failure'
234234

235235
- name: Upload Ubuntu 24.04 Noble IPA kernel image to Ark
@@ -245,7 +245,7 @@ jobs:
245245
-e os_release="noble" \
246246
-e file_regex='*.kernel'
247247
env:
248-
KAYOBE_VAULT_PASSWORD: ${{ secrets.KAYOBE_VAULT_PASSWORD }}
248+
KAYOBE_VAULT_PASSWORD: ${{ secrets.KAYOBE_VAULT_PASSWORD_CI_BUILDER }}
249249
if: inputs.ubuntu-noble && steps.build_ubuntu_noble_ipa.outcome == 'success'
250250

251251
- name: Upload Ubuntu 24.04 Noble IPA ramdisk image to Ark
@@ -261,7 +261,7 @@ jobs:
261261
-e os_release="noble" \
262262
-e file_regex='*.initramfs'
263263
env:
264-
KAYOBE_VAULT_PASSWORD: ${{ secrets.KAYOBE_VAULT_PASSWORD }}
264+
KAYOBE_VAULT_PASSWORD: ${{ secrets.KAYOBE_VAULT_PASSWORD_CI_BUILDER }}
265265
if: inputs.ubuntu-noble && steps.build_ubuntu_noble_ipa.outcome == 'success'
266266

267267
- name: Build a Rocky 9 IPA image
@@ -276,7 +276,7 @@ jobs:
276276
-e ipa_ci_builder_distribution="rocky" \
277277
-e ipa_ci_builder_release="9"
278278
env:
279-
KAYOBE_VAULT_PASSWORD: ${{ secrets.KAYOBE_VAULT_PASSWORD }}
279+
KAYOBE_VAULT_PASSWORD: ${{ secrets.KAYOBE_VAULT_PASSWORD_CI_BUILDER }}
280280
if: inputs.rocky9
281281

282282
- name: Show last error logs
@@ -286,7 +286,7 @@ jobs:
286286
source src/kayobe-config/kayobe-env --environment ci-builder &&
287287
kayobe seed host command run --command "tail -200 /opt/kayobe/images/ipa/ipa.stdout" --show-output
288288
env:
289-
KAYOBE_VAULT_PASSWORD: ${{ secrets.KAYOBE_VAULT_PASSWORD }}
289+
KAYOBE_VAULT_PASSWORD: ${{ secrets.KAYOBE_VAULT_PASSWORD_CI_BUILDER }}
290290
if: steps.build_rocky_9_ipa.outcome == 'failure'
291291

292292
- name: Upload Rocky 9 IPA kernel image to Ark
@@ -302,7 +302,7 @@ jobs:
302302
-e os_release="9" \
303303
-e file_regex='*.kernel'
304304
env:
305-
KAYOBE_VAULT_PASSWORD: ${{ secrets.KAYOBE_VAULT_PASSWORD }}
305+
KAYOBE_VAULT_PASSWORD: ${{ secrets.KAYOBE_VAULT_PASSWORD_CI_BUILDER }}
306306
if: inputs.rocky9 && steps.build_rocky_9_ipa.outcome == 'success'
307307

308308
- name: Upload Rocky 9 IPA ramdisk image to Ark
@@ -318,7 +318,7 @@ jobs:
318318
-e os_release="9" \
319319
-e file_regex='*.initramfs'
320320
env:
321-
KAYOBE_VAULT_PASSWORD: ${{ secrets.KAYOBE_VAULT_PASSWORD }}
321+
KAYOBE_VAULT_PASSWORD: ${{ secrets.KAYOBE_VAULT_PASSWORD_CI_BUILDER }}
322322
if: inputs.rocky9 && steps.build_rocky_9_ipa.outcome == 'success'
323323

324324
- name: Copy logs back

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ jobs:
8282
-e os_release='9'
8383
env:
8484
ARTIFACT_TAG: ${{ inputs.image_tag }}
85-
KAYOBE_VAULT_PASSWORD: ${{ secrets.KAYOBE_VAULT_PASSWORD }}
85+
KAYOBE_VAULT_PASSWORD: ${{ secrets.KAYOBE_VAULT_PASSWORD_CI_BUILDER }}
8686
if: inputs.rocky9
8787

8888
- name: Promote Ubuntu Noble 24.04 IPA image artifact
@@ -96,5 +96,5 @@ jobs:
9696
-e os_release='noble'
9797
env:
9898
ARTIFACT_TAG: ${{ inputs.image_tag }}
99-
KAYOBE_VAULT_PASSWORD: ${{ secrets.KAYOBE_VAULT_PASSWORD }}
99+
KAYOBE_VAULT_PASSWORD: ${{ secrets.KAYOBE_VAULT_PASSWORD_CI_BUILDER }}
100100
if: inputs.ubuntu-noble

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

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ on:
2323
type: boolean
2424
default: true
2525
secrets:
26-
KAYOBE_VAULT_PASSWORD:
26+
KAYOBE_VAULT_PASSWORD_CI_BUILDER:
2727
required: true
2828
CLOUDS_YAML:
2929
required: true
@@ -35,7 +35,7 @@ on:
3535
env:
3636
ANSIBLE_FORCE_COLOR: True
3737
KAYOBE_ENVIRONMENT: ci-builder
38-
KAYOBE_VAULT_PASSWORD: ${{ secrets.KAYOBE_VAULT_PASSWORD }}
38+
KAYOBE_VAULT_PASSWORD: ${{ secrets.KAYOBE_VAULT_PASSWORD_CI_BUILDER }}
3939
jobs:
4040
runner-selection:
4141
uses: ./.github/workflows/runner-selector.yml
@@ -214,15 +214,15 @@ jobs:
214214
kayobe seed host command run \
215215
--command "sudo apt update && sudo apt -y install gcc git libffi-dev python3-dev python-is-python3 python3-venv containerd docker.io docker-buildx" --show-output
216216
env:
217-
KAYOBE_VAULT_PASSWORD: ${{ secrets.KAYOBE_VAULT_PASSWORD }}
217+
KAYOBE_VAULT_PASSWORD: ${{ secrets.KAYOBE_VAULT_PASSWORD_CI_BUILDER }}
218218

219219
- name: Create bifrost_httpboot Docker volume
220220
run: |
221221
source venvs/kayobe/bin/activate &&
222222
source src/kayobe-config/kayobe-env --environment ci-builder &&
223223
kayobe seed host command run --command "sudo mkdir -p /var/lib/docker/volumes/bifrost_httpboot/_data" --show-output
224224
env:
225-
KAYOBE_VAULT_PASSWORD: ${{ secrets.KAYOBE_VAULT_PASSWORD }}
225+
KAYOBE_VAULT_PASSWORD: ${{ secrets.KAYOBE_VAULT_PASSWORD_CI_BUILDER }}
226226

227227
- name: Build a Rocky Linux 9 overcloud host image
228228
id: build_rocky_9
@@ -235,7 +235,7 @@ jobs:
235235
-e os_release="9" \
236236
-e stackhpc_overcloud_dib_name=overcloud-rocky-9
237237
env:
238-
KAYOBE_VAULT_PASSWORD: ${{ secrets.KAYOBE_VAULT_PASSWORD }}
238+
KAYOBE_VAULT_PASSWORD: ${{ secrets.KAYOBE_VAULT_PASSWORD_CI_BUILDER }}
239239
if: inputs.rocky9
240240

241241
- name: Show last error logs
@@ -245,7 +245,7 @@ jobs:
245245
source src/kayobe-config/kayobe-env --environment ci-builder &&
246246
kayobe seed host command run --command "tail -200 /opt/kayobe/images/overcloud-rocky-9/overcloud-rocky-9.stdout" --show-output
247247
env:
248-
KAYOBE_VAULT_PASSWORD: ${{ secrets.KAYOBE_VAULT_PASSWORD }}
248+
KAYOBE_VAULT_PASSWORD: ${{ secrets.KAYOBE_VAULT_PASSWORD_CI_BUILDER }}
249249
if: steps.build_rocky_9.outcome == 'failure'
250250

251251
- name: Upload Rocky Linux 9 overcloud host image to current Dev Cloud (SMS/Leafcloud)
@@ -289,7 +289,7 @@ jobs:
289289
-e os_distribution="rocky" \
290290
-e os_release="9"
291291
env:
292-
KAYOBE_VAULT_PASSWORD: ${{ secrets.KAYOBE_VAULT_PASSWORD }}
292+
KAYOBE_VAULT_PASSWORD: ${{ secrets.KAYOBE_VAULT_PASSWORD_CI_BUILDER }}
293293
if: inputs.rocky9 && steps.build_rocky_9.outcome == 'success'
294294

295295
- name: Build an Ubuntu Noble 24.04 overcloud host image
@@ -303,7 +303,7 @@ jobs:
303303
-e os_release="noble" \
304304
-e stackhpc_overcloud_dib_name=overcloud-ubuntu-noble
305305
env:
306-
KAYOBE_VAULT_PASSWORD: ${{ secrets.KAYOBE_VAULT_PASSWORD }}
306+
KAYOBE_VAULT_PASSWORD: ${{ secrets.KAYOBE_VAULT_PASSWORD_CI_BUILDER }}
307307
if: inputs.ubuntu-noble
308308

309309
- name: Show last error logs
@@ -313,7 +313,7 @@ jobs:
313313
source src/kayobe-config/kayobe-env --environment ci-builder &&
314314
kayobe seed host command run --command "tail -200 /opt/kayobe/images/overcloud-ubuntu-noble/overcloud-ubuntu-noble.stdout" --show-output
315315
env:
316-
KAYOBE_VAULT_PASSWORD: ${{ secrets.KAYOBE_VAULT_PASSWORD }}
316+
KAYOBE_VAULT_PASSWORD: ${{ secrets.KAYOBE_VAULT_PASSWORD_CI_BUILDER }}
317317
if: steps.build_ubuntu_noble.outcome == 'failure'
318318

319319
- name: Upload Ubuntu Noble overcloud host image to current Dev Cloud (SMS/Leafcloud)
@@ -357,7 +357,7 @@ jobs:
357357
-e os_distribution="ubuntu" \
358358
-e os_release="noble"
359359
env:
360-
KAYOBE_VAULT_PASSWORD: ${{ secrets.KAYOBE_VAULT_PASSWORD }}
360+
KAYOBE_VAULT_PASSWORD: ${{ secrets.KAYOBE_VAULT_PASSWORD_CI_BUILDER }}
361361
if: inputs.ubuntu-noble && steps.build_ubuntu_noble.outcome == 'success'
362362

363363
- name: Copy logs back

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ jobs:
9292
-e os_release='9' \
9393
-e promotion_tag=${{ steps.rocky9_image_tag.outputs.image_tag }}
9494
env:
95-
KAYOBE_VAULT_PASSWORD: ${{ secrets.KAYOBE_VAULT_PASSWORD }}
95+
KAYOBE_VAULT_PASSWORD: ${{ secrets.KAYOBE_VAULT_PASSWORD_CI_BUILDER }}
9696
if: inputs.rocky9
9797

9898
- name: Promote Ubuntu Noble 24.04 overcloud host image artifact
@@ -106,5 +106,5 @@ jobs:
106106
-e os_release='noble' \
107107
-e promotion_tag=${{ steps.ubuntu_noble_image_tag.outputs.image_tag }}
108108
env:
109-
KAYOBE_VAULT_PASSWORD: ${{ secrets.KAYOBE_VAULT_PASSWORD }}
109+
KAYOBE_VAULT_PASSWORD: ${{ secrets.KAYOBE_VAULT_PASSWORD_CI_BUILDER }}
110110
if: inputs.ubuntu-noble

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ on:
2323
- SMS Lab
2424
- Leafcloud
2525
secrets:
26-
KAYOBE_VAULT_PASSWORD:
26+
KAYOBE_VAULT_PASSWORD_CI_BUILDER:
2727
required: true
2828
CLOUDS_YAML:
2929
required: true
@@ -122,7 +122,7 @@ jobs:
122122
-e os_distribution="rocky" \
123123
-e os_release="9"
124124
env:
125-
KAYOBE_VAULT_PASSWORD: ${{ secrets.KAYOBE_VAULT_PASSWORD }}
125+
KAYOBE_VAULT_PASSWORD: ${{ secrets.KAYOBE_VAULT_PASSWORD_CI_BUILDER }}
126126
if: inputs.rocky9 && steps.rocky_9_image_exists.outcome == 'failure'
127127

128128
- name: Upload Rocky Linux 9 overcloud host image to Cloud
@@ -167,7 +167,7 @@ jobs:
167167
-e os_distribution="ubuntu" \
168168
-e os_release="noble"
169169
env:
170-
KAYOBE_VAULT_PASSWORD: ${{ secrets.KAYOBE_VAULT_PASSWORD }}
170+
KAYOBE_VAULT_PASSWORD: ${{ secrets.KAYOBE_VAULT_PASSWORD_CI_BUILDER }}
171171
if: inputs.ubuntu-noble && steps.ubuntu_noble_image_exists.outcome == 'failure'
172172

173173
- name: Upload Ubuntu Noble 24.04 overcloud host image to Cloud

0 commit comments

Comments
 (0)