Skip to content

Commit 4d1037a

Browse files
wtripp180901wtripp180901
committed
sync 2025.1
2 parents 595c651 + 9e3ba0c commit 4d1037a

80 files changed

Lines changed: 907 additions & 865 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

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

Lines changed: 10 additions & 10 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
@@ -49,7 +49,7 @@ jobs:
4949
sudo /etc/init.d/ssh start
5050
5151
- name: Checkout
52-
uses: actions/checkout@v4
52+
uses: actions/checkout@v6
5353
with:
5454
path: src/kayobe-config
5555

@@ -80,7 +80,7 @@ jobs:
8080
pip install -r ../src/kayobe-config/requirements.txt
8181
8282
- name: Install terraform
83-
uses: hashicorp/setup-terraform@v2
83+
uses: hashicorp/setup-terraform@v3
8484

8585
- name: Initialise terraform
8686
run: terraform init
@@ -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
@@ -255,7 +255,7 @@ jobs:
255255
if: steps.build_amphora.outcome == 'failure'
256256

257257
- name: Upload logs & image artifact
258-
uses: actions/upload-artifact@v4
258+
uses: actions/upload-artifact@v6
259259
with:
260260
name: amphora-image-build-log
261261
path: ./artifact

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
if: github.repository == 'stackhpc/stackhpc-kayobe-config'
1616
runs-on: ubuntu-22.04
1717
steps:
18-
- uses: actions/checkout@v4
18+
- uses: actions/checkout@v6
1919
with:
2020
path: src/kayobe-config
2121

@@ -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/build-rocky-packages.yml‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
---
2+
# This workflow builds required versions of OVN and OVS for
3+
# Rocky Linux 10 then pushes them to a registry.
4+
5+
# This will only be needed until we move to newer OVN/OVS
6+
# packages, which already exist in the NFV SIG repository for
7+
# CentOS Stream 10.
8+
9+
name: Build Rocky 10 OVN/OVS Packages
10+
on: workflow_dispatch
11+
12+
jobs:
13+
run-away:
14+
runs-on: ubuntu-latest
15+
steps:
16+
- name: Print message and run away
17+
run: echo "This workflow is not operational yet"

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

Lines changed: 15 additions & 15 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
@@ -57,7 +57,7 @@ jobs:
5757
sudo /etc/init.d/ssh start
5858
5959
- name: Checkout
60-
uses: actions/checkout@v4
60+
uses: actions/checkout@v6
6161
with:
6262
path: src/kayobe-config
6363

@@ -86,7 +86,7 @@ jobs:
8686
pip install -r ../src/kayobe-config/requirements.txt
8787
8888
- name: Install terraform
89-
uses: hashicorp/setup-terraform@v2
89+
uses: hashicorp/setup-terraform@v3
9090

9191
- name: Initialise terraform
9292
run: terraform init
@@ -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
@@ -329,7 +329,7 @@ jobs:
329329
if: always()
330330

331331
- name: Upload logs artifact
332-
uses: actions/upload-artifact@v4
332+
uses: actions/upload-artifact@v6
333333
with:
334334
name: Build logs
335335
path: ./logs

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ jobs:
3030
exit 1
3131
fi
3232
33-
- uses: actions/checkout@v4
33+
- uses: actions/checkout@v6
3434
with:
3535
path: src/kayobe-config
3636

@@ -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/multinode-inputs.py‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -35,12 +35,11 @@ class Scenario:
3535
UBUNTU_NOBLE = OSRelease("ubuntu", "noble", "ubuntu")
3636
# NOTE(upgrade): Add supported releases here.
3737
OPENSTACK_RELEASES = [
38-
OpenStackRelease("2023.1", "zed", [ROCKY_9, UBUNTU_JAMMY]),
3938
OpenStackRelease("2024.1", "2023.1", [ROCKY_9, UBUNTU_JAMMY]),
4039
OpenStackRelease("2025.1", "2024.1", [ROCKY_9, UBUNTU_NOBLE]),
4140
]
4241
NEUTRON_PLUGINS = ["ovs", "ovn"]
43-
VERSION_HIERARCHY = ["zed", "2023.1", "2024.1", "2025.1"]
42+
VERSION_HIERARCHY = ["2023.1", "2024.1", "2025.1"]
4443

4544

4645
def main() -> None:
@@ -85,9 +84,7 @@ def get_branch(version: str) -> str:
8584

8685

8786
def get_tkm_version(version: str) -> str:
88-
if version == "zed":
89-
return "ea61ea1730e179e05e8f0e58b759267664c555e7"
90-
elif version == "2025.1":
87+
if version == "2025.1":
9188
return "main"
9289
else:
9390
return get_branch(version)

0 commit comments

Comments
 (0)