Skip to content

Commit 7d2a59e

Browse files
Alex-WelshAlex-Welsh
committed
Use new ci-builder vault pw in workflows
1 parent eb8f0ef commit 7d2a59e

File tree

4 files changed

+28
-28
lines changed

4 files changed

+28
-28
lines changed

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

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ on:
2424
type: boolean
2525
default: true
2626
secrets:
27-
KAYOBE_VAULT_PASSWORD:
27+
KAYOBE_VAULT_PASSWORD_CI_BUILDER:
2828
required: true
2929
CLOUDS_YAML:
3030
required: true
@@ -36,7 +36,7 @@ on:
3636
env:
3737
ANSIBLE_FORCE_COLOR: True
3838
KAYOBE_ENVIRONMENT: ci-builder
39-
KAYOBE_VAULT_PASSWORD: ${{ secrets.KAYOBE_VAULT_PASSWORD }}
39+
KAYOBE_VAULT_PASSWORD: ${{ secrets.KAYOBE_VAULT_PASSWORD_CI_BUILDER }}
4040
jobs:
4141
overcloud-host-image-build:
4242
name: Build overcloud host images
@@ -212,15 +212,15 @@ jobs:
212212
kayobe seed host command run \
213213
--command "sudo dnf config-manager --set-enabled crb && sudo dnf -y install epel-release && sudo dnf -y install zstd debootstrap kpartx cloud-init" --show-output
214214
env:
215-
KAYOBE_VAULT_PASSWORD: ${{ secrets.KAYOBE_VAULT_PASSWORD }}
215+
KAYOBE_VAULT_PASSWORD: ${{ secrets.KAYOBE_VAULT_PASSWORD_CI_BUILDER }}
216216

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

225225
- name: Build a CentOS Stream 8 overcloud host image
226226
id: build_centos_stream_8
@@ -337,7 +337,7 @@ jobs:
337337
-e os_release="9" \
338338
-e stackhpc_overcloud_dib_name=overcloud-rocky-9
339339
env:
340-
KAYOBE_VAULT_PASSWORD: ${{ secrets.KAYOBE_VAULT_PASSWORD }}
340+
KAYOBE_VAULT_PASSWORD: ${{ secrets.KAYOBE_VAULT_PASSWORD_CI_BUILDER }}
341341
if: inputs.rocky9
342342

343343
- name: Show last error logs
@@ -347,7 +347,7 @@ jobs:
347347
source src/kayobe-config/kayobe-env --environment ci-builder &&
348348
kayobe seed host command run --command "tail -200 /opt/kayobe/images/overcloud-rocky-9/overcloud-rocky-9.stdout" --show-output
349349
env:
350-
KAYOBE_VAULT_PASSWORD: ${{ secrets.KAYOBE_VAULT_PASSWORD }}
350+
KAYOBE_VAULT_PASSWORD: ${{ secrets.KAYOBE_VAULT_PASSWORD_CI_BUILDER }}
351351
if: steps.build_rocky_9.outcome == 'failure'
352352

353353
- name: Upload Rocky Linux 9 overcloud host image to Ark
@@ -361,7 +361,7 @@ jobs:
361361
-e os_distribution="rocky" \
362362
-e os_release="9"
363363
env:
364-
KAYOBE_VAULT_PASSWORD: ${{ secrets.KAYOBE_VAULT_PASSWORD }}
364+
KAYOBE_VAULT_PASSWORD: ${{ secrets.KAYOBE_VAULT_PASSWORD_CI_BUILDER }}
365365
if: inputs.rocky9 && steps.build_rocky_9.outcome == 'success'
366366

367367
- name: Upload Rocky Linux 9 overcloud host image to Dev Cloud
@@ -389,7 +389,7 @@ jobs:
389389
-e os_release="focal" \
390390
-e stackhpc_overcloud_dib_name=overcloud-ubuntu-focal
391391
env:
392-
KAYOBE_VAULT_PASSWORD: ${{ secrets.KAYOBE_VAULT_PASSWORD }}
392+
KAYOBE_VAULT_PASSWORD: ${{ secrets.KAYOBE_VAULT_PASSWORD_CI_BUILDER }}
393393
if: inputs.ubuntu-focal
394394

395395
- name: Show last error logs
@@ -399,7 +399,7 @@ jobs:
399399
source src/kayobe-config/kayobe-env --environment ci-builder &&
400400
kayobe seed host command run --command "tail -200 /opt/kayobe/images/overcloud-ubuntu-focal/overcloud-ubuntu-focal.stdout" --show-output
401401
env:
402-
KAYOBE_VAULT_PASSWORD: ${{ secrets.KAYOBE_VAULT_PASSWORD }}
402+
KAYOBE_VAULT_PASSWORD: ${{ secrets.KAYOBE_VAULT_PASSWORD_CI_BUILDER }}
403403
if: steps.build_ubuntu_focal.outcome == 'failure'
404404

405405
- name: Upload Ubuntu Focal 20.04 overcloud host image to Ark
@@ -413,7 +413,7 @@ jobs:
413413
-e os_distribution="ubuntu" \
414414
-e os_release="focal"
415415
env:
416-
KAYOBE_VAULT_PASSWORD: ${{ secrets.KAYOBE_VAULT_PASSWORD }}
416+
KAYOBE_VAULT_PASSWORD: ${{ secrets.KAYOBE_VAULT_PASSWORD_CI_BUILDER }}
417417
if: inputs.ubuntu-focal && steps.build_ubuntu_focal.outcome == 'success'
418418

419419
- name: Upload Ubuntu Focal overcloud host image to Dev Cloud
@@ -441,7 +441,7 @@ jobs:
441441
-e os_release="jammy" \
442442
-e stackhpc_overcloud_dib_name=overcloud-ubuntu-jammy
443443
env:
444-
KAYOBE_VAULT_PASSWORD: ${{ secrets.KAYOBE_VAULT_PASSWORD }}
444+
KAYOBE_VAULT_PASSWORD: ${{ secrets.KAYOBE_VAULT_PASSWORD_CI_BUILDER }}
445445
if: inputs.ubuntu-jammy
446446

447447
- name: Show last error logs
@@ -451,7 +451,7 @@ jobs:
451451
source src/kayobe-config/kayobe-env --environment ci-builder &&
452452
kayobe seed host command run --command "tail -200 /opt/kayobe/images/overcloud-ubuntu-jammy/overcloud-ubuntu-jammy.stdout" --show-output
453453
env:
454-
KAYOBE_VAULT_PASSWORD: ${{ secrets.KAYOBE_VAULT_PASSWORD }}
454+
KAYOBE_VAULT_PASSWORD: ${{ secrets.KAYOBE_VAULT_PASSWORD_CI_BUILDER }}
455455
if: steps.build_ubuntu_jammy.outcome == 'failure'
456456

457457
- name: Upload Ubuntu Jammy 22.04 overcloud host image to Ark
@@ -465,7 +465,7 @@ jobs:
465465
-e os_distribution="ubuntu" \
466466
-e os_release="jammy"
467467
env:
468-
KAYOBE_VAULT_PASSWORD: ${{ secrets.KAYOBE_VAULT_PASSWORD }}
468+
KAYOBE_VAULT_PASSWORD: ${{ secrets.KAYOBE_VAULT_PASSWORD_CI_BUILDER }}
469469
if: inputs.ubuntu-jammy && steps.build_ubuntu_jammy.outcome == 'success'
470470

471471
- name: Upload Ubuntu Jammy overcloud host image to Dev Cloud

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ jobs:
9999
-e os_release='8-stream'
100100
env:
101101
OVERCLOUD_HOST_IMAGE_TAG: ${{ inputs.image_tag }}
102-
KAYOBE_VAULT_PASSWORD: ${{ secrets.KAYOBE_VAULT_PASSWORD }}
102+
KAYOBE_VAULT_PASSWORD: ${{ secrets.KAYOBE_VAULT_PASSWORD_CI_BUILDER }}
103103
if: inputs.centos
104104

105105
- name: Promote Rocky Linux 8 overcloud host image artifact
@@ -113,7 +113,7 @@ jobs:
113113
-e os_release='8'
114114
env:
115115
OVERCLOUD_HOST_IMAGE_TAG: ${{ inputs.image_tag }}
116-
KAYOBE_VAULT_PASSWORD: ${{ secrets.KAYOBE_VAULT_PASSWORD }}
116+
KAYOBE_VAULT_PASSWORD: ${{ secrets.KAYOBE_VAULT_PASSWORD_CI_BUILDER }}
117117
if: inputs.rocky8
118118

119119
- name: Promote Rocky Linux 9 overcloud host image artifact
@@ -127,7 +127,7 @@ jobs:
127127
-e os_release='9'
128128
env:
129129
OVERCLOUD_HOST_IMAGE_TAG: ${{ inputs.image_tag }}
130-
KAYOBE_VAULT_PASSWORD: ${{ secrets.KAYOBE_VAULT_PASSWORD }}
130+
KAYOBE_VAULT_PASSWORD: ${{ secrets.KAYOBE_VAULT_PASSWORD_CI_BUILDER }}
131131
if: inputs.rocky9
132132

133133
- name: Promote Ubuntu Focal 20.04 overcloud host image artifact
@@ -141,7 +141,7 @@ jobs:
141141
-e os_release='focal'
142142
env:
143143
OVERCLOUD_HOST_IMAGE_TAG: ${{ inputs.image_tag }}
144-
KAYOBE_VAULT_PASSWORD: ${{ secrets.KAYOBE_VAULT_PASSWORD }}
144+
KAYOBE_VAULT_PASSWORD: ${{ secrets.KAYOBE_VAULT_PASSWORD_CI_BUILDER }}
145145
if: inputs.ubuntu-focal
146146

147147
- name: Promote Ubuntu Jammy 22.04 overcloud host image artifact
@@ -155,5 +155,5 @@ jobs:
155155
-e os_release='jammy'
156156
env:
157157
OVERCLOUD_HOST_IMAGE_TAG: ${{ inputs.image_tag }}
158-
KAYOBE_VAULT_PASSWORD: ${{ secrets.KAYOBE_VAULT_PASSWORD }}
158+
KAYOBE_VAULT_PASSWORD: ${{ secrets.KAYOBE_VAULT_PASSWORD_CI_BUILDER }}
159159
if: inputs.ubuntu-jammy

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ on:
2828
type: string
2929
default: "ci-builder"
3030
secrets:
31-
KAYOBE_VAULT_PASSWORD:
31+
KAYOBE_VAULT_PASSWORD_CI_BUILDER:
3232
required: true
3333
CLOUDS_YAML:
3434
required: true
@@ -120,7 +120,7 @@ jobs:
120120
-e os_distribution="centos" \
121121
-e os_release="8-stream"
122122
env:
123-
KAYOBE_VAULT_PASSWORD: ${{ secrets.KAYOBE_VAULT_PASSWORD }}
123+
KAYOBE_VAULT_PASSWORD: ${{ secrets.KAYOBE_VAULT_PASSWORD_CI_BUILDER }}
124124
if: inputs.centos && steps.centos_8_stream_image_exists.outcome == 'failure'
125125

126126
- name: Upload CentOS Stream 8 overcloud host image to Cloud
@@ -165,7 +165,7 @@ jobs:
165165
-e os_distribution="rocky" \
166166
-e os_release="8"
167167
env:
168-
KAYOBE_VAULT_PASSWORD: ${{ secrets.KAYOBE_VAULT_PASSWORD }}
168+
KAYOBE_VAULT_PASSWORD: ${{ secrets.KAYOBE_VAULT_PASSWORD_CI_BUILDER }}
169169
if: inputs.rocky8 && steps.rocky_8_image_exists.outcome == 'failure'
170170

171171
- name: Upload Rocky Linux 8 overcloud host image to Cloud
@@ -210,7 +210,7 @@ jobs:
210210
-e os_distribution="rocky" \
211211
-e os_release="9"
212212
env:
213-
KAYOBE_VAULT_PASSWORD: ${{ secrets.KAYOBE_VAULT_PASSWORD }}
213+
KAYOBE_VAULT_PASSWORD: ${{ secrets.KAYOBE_VAULT_PASSWORD_CI_BUILDER }}
214214
if: inputs.rocky9 && steps.rocky_9_image_exists.outcome == 'failure'
215215

216216
- name: Upload Rocky Linux 9 overcloud host image to Cloud
@@ -255,7 +255,7 @@ jobs:
255255
-e os_distribution="ubuntu" \
256256
-e os_release="focal"
257257
env:
258-
KAYOBE_VAULT_PASSWORD: ${{ secrets.KAYOBE_VAULT_PASSWORD }}
258+
KAYOBE_VAULT_PASSWORD: ${{ secrets.KAYOBE_VAULT_PASSWORD_CI_BUILDER }}
259259
if: inputs.ubuntu-focal && steps.ubuntu_focal_image_exists.outcome == 'failure'
260260

261261
- name: Upload Ubuntu Focal 20.04 overcloud host image to Cloud
@@ -300,7 +300,7 @@ jobs:
300300
-e os_distribution="ubuntu" \
301301
-e os_release="jammy"
302302
env:
303-
KAYOBE_VAULT_PASSWORD: ${{ secrets.KAYOBE_VAULT_PASSWORD }}
303+
KAYOBE_VAULT_PASSWORD: ${{ secrets.KAYOBE_VAULT_PASSWORD_CI_BUILDER }}
304304
if: inputs.ubuntu-jammy && steps.ubuntu_jammy_image_exists.outcome == 'failure'
305305

306306
- name: Upload Ubuntu Jammy 22.04 overcloud host image to Cloud

‎.github/workflows/stackhpc-container-image-build.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,7 @@ jobs:
177177
source src/kayobe-config/kayobe-env --environment ci-builder &&
178178
kayobe playbook run $KAYOBE_CONFIG_PATH/ansible/pulp-auth-proxy.yml -e pulp_auth_proxy_conf_path=/home/runner/_work/pulp_proxy
179179
env:
180-
KAYOBE_VAULT_PASSWORD: ${{ secrets.KAYOBE_VAULT_PASSWORD }}
180+
KAYOBE_VAULT_PASSWORD: ${{ secrets.KAYOBE_VAULT_PASSWORD_CI_BUILDER }}
181181

182182
- name: Create build logs output directory
183183
run: mkdir image-build-logs
@@ -194,7 +194,7 @@ jobs:
194194
source src/kayobe-config/kayobe-env --environment ci-builder &&
195195
kayobe overcloud container image build $args
196196
env:
197-
KAYOBE_VAULT_PASSWORD: ${{ secrets.KAYOBE_VAULT_PASSWORD }}
197+
KAYOBE_VAULT_PASSWORD: ${{ secrets.KAYOBE_VAULT_PASSWORD_CI_BUILDER }}
198198
if: inputs.overcloud
199199

200200
- name: Copy overcloud container image build logs to output directory
@@ -212,7 +212,7 @@ jobs:
212212
source src/kayobe-config/kayobe-env --environment ci-builder &&
213213
kayobe seed container image build $args
214214
env:
215-
KAYOBE_VAULT_PASSWORD: ${{ secrets.KAYOBE_VAULT_PASSWORD }}
215+
KAYOBE_VAULT_PASSWORD: ${{ secrets.KAYOBE_VAULT_PASSWORD_CI_BUILDER }}
216216
if: inputs.seed
217217

218218
- name: Copy seed container image build logs to output directory
@@ -275,7 +275,7 @@ jobs:
275275
done < image-build-logs/push-attempt-images.txt
276276
shell: bash
277277
env:
278-
KAYOBE_VAULT_PASSWORD: ${{ secrets.KAYOBE_VAULT_PASSWORD }}
278+
KAYOBE_VAULT_PASSWORD: ${{ secrets.KAYOBE_VAULT_PASSWORD_CI_BUILDER }}
279279
if: inputs.push
280280

281281
- name: Upload output artifact

0 commit comments

Comments
 (0)