Skip to content

Commit 9430288

Browse files
committed
Use new ci-builder vault pw in workflows
1 parent 4c42b8e commit 9430288

File tree

4 files changed

+19
-19
lines changed

4 files changed

+19
-19
lines changed

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

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ on:
1212
type: boolean
1313
default: true
1414
secrets:
15-
KAYOBE_VAULT_PASSWORD:
15+
KAYOBE_VAULT_PASSWORD_CI_BUILDER:
1616
required: true
1717
CLOUDS_YAML:
1818
required: true
@@ -24,7 +24,7 @@ on:
2424
env:
2525
ANSIBLE_FORCE_COLOR: True
2626
KAYOBE_ENVIRONMENT: ci-builder
27-
KAYOBE_VAULT_PASSWORD: ${{ secrets.KAYOBE_VAULT_PASSWORD }}
27+
KAYOBE_VAULT_PASSWORD: ${{ secrets.KAYOBE_VAULT_PASSWORD_CI_BUILDER }}
2828
jobs:
2929
overcloud-host-image-build:
3030
name: Build overcloud host images
@@ -200,15 +200,15 @@ jobs:
200200
kayobe seed host command run \
201201
--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
202202
env:
203-
KAYOBE_VAULT_PASSWORD: ${{ secrets.KAYOBE_VAULT_PASSWORD }}
203+
KAYOBE_VAULT_PASSWORD: ${{ secrets.KAYOBE_VAULT_PASSWORD_CI_BUILDER }}
204204

205205
- name: Create bifrost_httpboot Docker volume
206206
run: |
207207
source venvs/kayobe/bin/activate &&
208208
source src/kayobe-config/kayobe-env --environment ci-builder &&
209209
kayobe seed host command run --command "sudo mkdir -p /var/lib/docker/volumes/bifrost_httpboot/_data" --show-output
210210
env:
211-
KAYOBE_VAULT_PASSWORD: ${{ secrets.KAYOBE_VAULT_PASSWORD }}
211+
KAYOBE_VAULT_PASSWORD: ${{ secrets.KAYOBE_VAULT_PASSWORD_CI_BUILDER }}
212212

213213
- name: Build a Rocky Linux 9 overcloud host image
214214
id: build_rocky_9
@@ -221,7 +221,7 @@ jobs:
221221
-e os_release="9" \
222222
-e stackhpc_overcloud_dib_name=overcloud-rocky-9
223223
env:
224-
KAYOBE_VAULT_PASSWORD: ${{ secrets.KAYOBE_VAULT_PASSWORD }}
224+
KAYOBE_VAULT_PASSWORD: ${{ secrets.KAYOBE_VAULT_PASSWORD_CI_BUILDER }}
225225
if: inputs.rocky9
226226

227227
- name: Show last error logs
@@ -231,7 +231,7 @@ jobs:
231231
source src/kayobe-config/kayobe-env --environment ci-builder &&
232232
kayobe seed host command run --command "tail -200 /opt/kayobe/images/overcloud-rocky-9/overcloud-rocky-9.stdout" --show-output
233233
env:
234-
KAYOBE_VAULT_PASSWORD: ${{ secrets.KAYOBE_VAULT_PASSWORD }}
234+
KAYOBE_VAULT_PASSWORD: ${{ secrets.KAYOBE_VAULT_PASSWORD_CI_BUILDER }}
235235
if: steps.build_rocky_9.outcome == 'failure'
236236

237237
- name: Upload Rocky Linux 9 overcloud host image to Ark
@@ -245,7 +245,7 @@ jobs:
245245
-e os_distribution="rocky" \
246246
-e os_release="9"
247247
env:
248-
KAYOBE_VAULT_PASSWORD: ${{ secrets.KAYOBE_VAULT_PASSWORD }}
248+
KAYOBE_VAULT_PASSWORD: ${{ secrets.KAYOBE_VAULT_PASSWORD_CI_BUILDER }}
249249
if: inputs.rocky9 && steps.build_rocky_9.outcome == 'success'
250250

251251
- name: Upload Rocky Linux 9 overcloud host image to Dev Cloud
@@ -273,7 +273,7 @@ jobs:
273273
-e os_release="jammy" \
274274
-e stackhpc_overcloud_dib_name=overcloud-ubuntu-jammy
275275
env:
276-
KAYOBE_VAULT_PASSWORD: ${{ secrets.KAYOBE_VAULT_PASSWORD }}
276+
KAYOBE_VAULT_PASSWORD: ${{ secrets.KAYOBE_VAULT_PASSWORD_CI_BUILDER }}
277277
if: inputs.ubuntu-jammy
278278

279279
- name: Show last error logs
@@ -283,7 +283,7 @@ jobs:
283283
source src/kayobe-config/kayobe-env --environment ci-builder &&
284284
kayobe seed host command run --command "tail -200 /opt/kayobe/images/overcloud-ubuntu-jammy/overcloud-ubuntu-jammy.stdout" --show-output
285285
env:
286-
KAYOBE_VAULT_PASSWORD: ${{ secrets.KAYOBE_VAULT_PASSWORD }}
286+
KAYOBE_VAULT_PASSWORD: ${{ secrets.KAYOBE_VAULT_PASSWORD_CI_BUILDER }}
287287
if: steps.build_ubuntu_jammy.outcome == 'failure'
288288

289289
- name: Upload Ubuntu Jammy 22.04 overcloud host image to Ark
@@ -297,7 +297,7 @@ jobs:
297297
-e os_distribution="ubuntu" \
298298
-e os_release="jammy"
299299
env:
300-
KAYOBE_VAULT_PASSWORD: ${{ secrets.KAYOBE_VAULT_PASSWORD }}
300+
KAYOBE_VAULT_PASSWORD: ${{ secrets.KAYOBE_VAULT_PASSWORD_CI_BUILDER }}
301301
if: inputs.ubuntu-jammy && steps.build_ubuntu_jammy.outcome == 'success'
302302

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

.github/workflows/overcloud-host-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
OVERCLOUD_HOST_IMAGE_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 Jammy 22.04 overcloud host image artifact
@@ -96,5 +96,5 @@ jobs:
9696
-e os_release='jammy'
9797
env:
9898
OVERCLOUD_HOST_IMAGE_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-jammy

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ on:
1616
type: string
1717
default: "ci-builder"
1818
secrets:
19-
KAYOBE_VAULT_PASSWORD:
19+
KAYOBE_VAULT_PASSWORD_CI_BUILDER:
2020
required: true
2121
CLOUDS_YAML:
2222
required: true
@@ -108,7 +108,7 @@ jobs:
108108
-e os_distribution="rocky" \
109109
-e os_release="9"
110110
env:
111-
KAYOBE_VAULT_PASSWORD: ${{ secrets.KAYOBE_VAULT_PASSWORD }}
111+
KAYOBE_VAULT_PASSWORD: ${{ secrets.KAYOBE_VAULT_PASSWORD_CI_BUILDER }}
112112
if: inputs.rocky9 && steps.rocky_9_image_exists.outcome == 'failure'
113113

114114
- name: Upload Rocky Linux 9 overcloud host image to Cloud
@@ -153,7 +153,7 @@ jobs:
153153
-e os_distribution="ubuntu" \
154154
-e os_release="jammy"
155155
env:
156-
KAYOBE_VAULT_PASSWORD: ${{ secrets.KAYOBE_VAULT_PASSWORD }}
156+
KAYOBE_VAULT_PASSWORD: ${{ secrets.KAYOBE_VAULT_PASSWORD_CI_BUILDER }}
157157
if: inputs.ubuntu-jammy && steps.ubuntu_jammy_image_exists.outcome == 'failure'
158158

159159
- 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
@@ -172,7 +172,7 @@ jobs:
172172
source src/kayobe-config/kayobe-env --environment ci-builder &&
173173
kayobe playbook run $KAYOBE_CONFIG_PATH/ansible/pulp-auth-proxy.yml -e pulp_auth_proxy_conf_path=/home/runner/_work/pulp_proxy
174174
env:
175-
KAYOBE_VAULT_PASSWORD: ${{ secrets.KAYOBE_VAULT_PASSWORD }}
175+
KAYOBE_VAULT_PASSWORD: ${{ secrets.KAYOBE_VAULT_PASSWORD_CI_BUILDER }}
176176

177177
- name: Create build logs output directory
178178
run: mkdir image-build-logs
@@ -189,7 +189,7 @@ jobs:
189189
source src/kayobe-config/kayobe-env --environment ci-builder &&
190190
kayobe overcloud container image build $args
191191
env:
192-
KAYOBE_VAULT_PASSWORD: ${{ secrets.KAYOBE_VAULT_PASSWORD }}
192+
KAYOBE_VAULT_PASSWORD: ${{ secrets.KAYOBE_VAULT_PASSWORD_CI_BUILDER }}
193193
if: inputs.overcloud
194194

195195
- name: Copy overcloud container image build logs to output directory
@@ -207,7 +207,7 @@ jobs:
207207
source src/kayobe-config/kayobe-env --environment ci-builder &&
208208
kayobe seed container image build $args
209209
env:
210-
KAYOBE_VAULT_PASSWORD: ${{ secrets.KAYOBE_VAULT_PASSWORD }}
210+
KAYOBE_VAULT_PASSWORD: ${{ secrets.KAYOBE_VAULT_PASSWORD_CI_BUILDER }}
211211
if: inputs.seed
212212

213213
- name: Copy seed container image build logs to output directory
@@ -270,7 +270,7 @@ jobs:
270270
done < image-build-logs/push-attempt-images.txt
271271
shell: bash
272272
env:
273-
KAYOBE_VAULT_PASSWORD: ${{ secrets.KAYOBE_VAULT_PASSWORD }}
273+
KAYOBE_VAULT_PASSWORD: ${{ secrets.KAYOBE_VAULT_PASSWORD_CI_BUILDER }}
274274
if: inputs.push
275275

276276
- name: Upload output artifact

0 commit comments

Comments
 (0)