Skip to content

Commit 6ba63a1

Browse files
Alex-WelshAlex-Welsh
authored
Merge branch 'stackhpc/2025.1' into document-rabbitmq-queue-migrations-2025.1
2 parents e73e878 + 086ac87 commit 6ba63a1

File tree

83 files changed

+359
-195
lines changed

Some content is hidden

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

83 files changed

+359
-195
lines changed

‎.ansible-lint-ignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,3 +5,5 @@ etc/kayobe/ansible/vault-generate-internal-tls.yml fqcn[action-core]
55
etc/kayobe/ansible/vault-generate-test-external-tls.yml fqcn[action-core]
66
etc/kayobe/ansible/rabbitmq-reset.yml command-instead-of-module
77
etc/kayobe/ansible/ubuntu-upgrade.yml syntax-check[missing-file]
8+
etc/kayobe/ansible/check-kayobe-version.yml command-instead-of-module
9+
etc/kayobe/ansible/check-kolla-ansible-version.yml command-instead-of-module

‎.automation

‎.github/workflows/multinode-inputs.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ class Scenario:
3636
OPENSTACK_RELEASES = [
3737
OpenStackRelease("2023.1", "zed", [ROCKY_9, UBUNTU_JAMMY]),
3838
OpenStackRelease("2024.1", "2023.1", [ROCKY_9, UBUNTU_JAMMY]),
39-
OpenStackRelease("master", "2024.1", [ROCKY_9, UBUNTU_NOBLE]),
39+
OpenStackRelease("2025.1", "2024.1", [ROCKY_9, UBUNTU_NOBLE]),
4040
]
4141
NEUTRON_PLUGINS = ["ovs", "ovn"]
4242

‎.github/workflows/runner-selector.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ jobs:
3737

3838
- name: Set output for container image build runner
3939
run: echo "Setting runner for ${{ inputs.runner_env }} -> ${{ vars.RUNS_ON_TARGET_CONTAINER_IMAGE_BUILDER }}"
40-
40+
4141
- id: container-image-build-runner
4242
run: echo "runner_name_container_image_build=${{ vars.RUNS_ON_TARGET_CONTAINER_IMAGE_BUILDER }}" >> $GITHUB_OUTPUT
4343

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ on:
88
push:
99
branches:
1010
# NOTE(upgrade): Reference only the current release branch here.
11-
- stackhpc/master
11+
- stackhpc/2025.1
1212

1313
workflow_call:
1414
inputs:

‎.github/workflows/stackhpc-multinode.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ jobs:
6969
break_duration: ${{ fromJSON(inputs.break_duration) }}
7070
ssh_key: ${{ inputs.ssh_key }}
7171
stackhpc_kayobe_config_version: ${{ github.ref_name }}
72-
# NOTE(upgrade): Reference the PREVIOUS release here.
73-
stackhpc_kayobe_config_previous_version: ${{ inputs.upgrade == 'major' && 'stackhpc/2024.1' || 'stackhpc/master' }}
72+
# NOTE(upgrade): Reference the PREVIOUS and CURRENT releases here.
73+
stackhpc_kayobe_config_previous_version: ${{ inputs.upgrade == 'major' && 'stackhpc/2024.1' || 'stackhpc/2025.1' }}
7474
terraform_kayobe_multinode_version: ${{ inputs.terraform_kayobe_multinode_version }}
7575
secrets: inherit

‎.github/workflows/stackhpc-promote.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ on:
44
push:
55
branches:
66
# NOTE(upgrade): Reference only the current release branch here.
7-
- stackhpc/master
7+
- stackhpc/2025.1
88
jobs:
99
promote:
1010
name: Trigger Pulp promotion workflows

‎.github/workflows/stackhpc-pull-request.yml

Lines changed: 111 additions & 110 deletions
Original file line numberDiff line numberDiff line change
@@ -109,100 +109,29 @@ jobs:
109109
# when the parent jobs completed successfully or were skipped. We pass an
110110
# 'if' argument to the called workflow to allow running it conditionally.
111111

112-
build-kayobe-image:
113-
name: Build Kayobe Image
114-
needs:
115-
- check-changes
116-
uses: ./.github/workflows/stackhpc-build-kayobe-image.yml
117-
with:
118-
if: ${{ needs.check-changes.outputs.build-kayobe-image == 'true' }}
119-
if: github.repository == 'stackhpc/stackhpc-kayobe-config'
112+
# build-kayobe-image:
113+
# name: Build Kayobe Image
114+
# needs:
115+
# - check-changes
116+
# uses: ./.github/workflows/stackhpc-build-kayobe-image.yml
117+
# with:
118+
# if: ${{ needs.check-changes.outputs.build-kayobe-image == 'true' }}
119+
# if: github.repository == 'stackhpc/stackhpc-kayobe-config'
120120

121-
check-tags:
122-
name: Check container image tags
123-
needs:
124-
- check-changes
125-
- build-kayobe-image
126-
uses: ./.github/workflows/stackhpc-check-tags.yml
127-
with:
128-
kayobe_image: ${{ needs.build-kayobe-image.outputs.kayobe_image }}
129-
if: ${{ needs.check-changes.outputs.check-tags == 'true' }}
130-
secrets: inherit
131-
if: ${{ ! failure() && ! cancelled() && github.repository == 'stackhpc/stackhpc-kayobe-config' }}
132-
133-
all-in-one-ubuntu-noble-ovs:
134-
name: aio (Ubuntu Noble OVS)
135-
needs:
136-
- check-changes
137-
- build-kayobe-image
138-
uses: ./.github/workflows/stackhpc-all-in-one.yml
139-
with:
140-
kayobe_image: ${{ needs.build-kayobe-image.outputs.kayobe_image }}
141-
os_distribution: ubuntu
142-
os_release: noble
143-
ssh_username: ubuntu
144-
neutron_plugin: ovs
145-
OS_CLOUD: openstack
146-
if: ${{ needs.check-changes.outputs.aio == 'true' }}
147-
secrets: inherit
148-
if: ${{ ! failure() && ! cancelled() && github.repository == 'stackhpc/stackhpc-kayobe-config' }}
149-
150-
all-in-one-ubuntu-noble-ovn:
151-
name: aio (Ubuntu Noble OVN)
152-
needs:
153-
- check-changes
154-
- build-kayobe-image
155-
uses: ./.github/workflows/stackhpc-all-in-one.yml
156-
with:
157-
kayobe_image: ${{ needs.build-kayobe-image.outputs.kayobe_image }}
158-
os_distribution: ubuntu
159-
os_release: noble
160-
ssh_username: ubuntu
161-
neutron_plugin: ovn
162-
OS_CLOUD: openstack
163-
if: ${{ needs.check-changes.outputs.aio == 'true' }}
164-
secrets: inherit
165-
if: ${{ ! failure() && ! cancelled() && github.repository == 'stackhpc/stackhpc-kayobe-config' }}
166-
167-
all-in-one-rocky-9-ovs:
168-
name: aio (Rocky 9 OVS)
169-
needs:
170-
- check-changes
171-
- build-kayobe-image
172-
uses: ./.github/workflows/stackhpc-all-in-one.yml
173-
with:
174-
kayobe_image: ${{ needs.build-kayobe-image.outputs.kayobe_image }}
175-
os_distribution: rocky
176-
os_release: "9"
177-
ssh_username: cloud-user
178-
neutron_plugin: ovs
179-
OS_CLOUD: openstack
180-
if: ${{ needs.check-changes.outputs.aio == 'true' }}
181-
secrets: inherit
182-
if: ${{ ! failure() && ! cancelled() && github.repository == 'stackhpc/stackhpc-kayobe-config' }}
183-
184-
all-in-one-rocky-9-ovn:
185-
name: aio (Rocky 9 OVN)
186-
needs:
187-
- check-changes
188-
- build-kayobe-image
189-
uses: ./.github/workflows/stackhpc-all-in-one.yml
190-
with:
191-
kayobe_image: ${{ needs.build-kayobe-image.outputs.kayobe_image }}
192-
os_distribution: rocky
193-
os_release: "9"
194-
ssh_username: cloud-user
195-
neutron_plugin: ovn
196-
OS_CLOUD: openstack
197-
if: ${{ needs.check-changes.outputs.aio == 'true' }}
198-
secrets: inherit
199-
if: ${{ ! failure() && ! cancelled() && github.repository == 'stackhpc/stackhpc-kayobe-config' }}
200-
201-
# Test two upgrade scenarios: Ubuntu Noble OVS and Rocky 9 OVN.
202-
203-
# On hold until Noble support lands in stackhpc/2024.1
204-
# all-in-one-upgrade-ubuntu-noble-ovs:
205-
# name: aio upgrade (Ubuntu Noble OVS)
121+
# check-tags:
122+
# name: Check container image tags
123+
# needs:
124+
# - check-changes
125+
# - build-kayobe-image
126+
# uses: ./.github/workflows/stackhpc-check-tags.yml
127+
# with:
128+
# kayobe_image: ${{ needs.build-kayobe-image.outputs.kayobe_image }}
129+
# if: ${{ needs.check-changes.outputs.check-tags == 'true' }}
130+
# secrets: inherit
131+
# if: ${{ ! failure() && ! cancelled() && github.repository == 'stackhpc/stackhpc-kayobe-config' }}
132+
133+
# all-in-one-ubuntu-noble-ovn:
134+
# name: aio (Ubuntu Noble OVN)
206135
# needs:
207136
# - check-changes
208137
# - build-kayobe-image
@@ -212,27 +141,99 @@ jobs:
212141
# os_distribution: ubuntu
213142
# os_release: noble
214143
# ssh_username: ubuntu
144+
# neutron_plugin: ovn
145+
# OS_CLOUD: openstack
146+
# if: ${{ needs.check-changes.outputs.aio == 'true' }}
147+
# secrets: inherit
148+
# if: ${{ ! failure() && ! cancelled() && github.repository == 'stackhpc/stackhpc-kayobe-config' }}
149+
150+
# all-in-one-rocky-9-ovs:
151+
# name: aio (Rocky 9 OVS)
152+
# needs:
153+
# - check-changes
154+
# - build-kayobe-image
155+
# uses: ./.github/workflows/stackhpc-all-in-one.yml
156+
# with:
157+
# kayobe_image: ${{ needs.build-kayobe-image.outputs.kayobe_image }}
158+
# os_distribution: rocky
159+
# os_release: "9"
160+
# ssh_username: cloud-user
215161
# neutron_plugin: ovs
216162
# OS_CLOUD: openstack
217163
# if: ${{ needs.check-changes.outputs.aio == 'true' }}
164+
# secrets: inherit
165+
# if: ${{ ! failure() && ! cancelled() && github.repository == 'stackhpc/stackhpc-kayobe-config' }}
166+
167+
# all-in-one-rocky-9-ovn:
168+
# name: aio (Rocky 9 OVN)
169+
# needs:
170+
# - check-changes
171+
# - build-kayobe-image
172+
# uses: ./.github/workflows/stackhpc-all-in-one.yml
173+
# with:
174+
# kayobe_image: ${{ needs.build-kayobe-image.outputs.kayobe_image }}
175+
# os_distribution: rocky
176+
# os_release: "9"
177+
# ssh_username: cloud-user
178+
# neutron_plugin: ovn
179+
# OS_CLOUD: openstack
180+
# if: ${{ needs.check-changes.outputs.aio == 'true' }}
181+
# secrets: inherit
182+
# if: ${{ ! failure() && ! cancelled() && github.repository == 'stackhpc/stackhpc-kayobe-config' }}
183+
184+
# # Test two upgrade scenarios: Ubuntu Noble OVS and Rocky 9 OVN.
185+
186+
# # On hold until Noble support lands in stackhpc/2024.1
187+
# # all-in-one-upgrade-ubuntu-noble-ovs:
188+
# # name: aio upgrade (Ubuntu Noble OVS)
189+
# # needs:
190+
# # - check-changes
191+
# # - build-kayobe-image
192+
# # uses: ./.github/workflows/stackhpc-all-in-one.yml
193+
# # with:
194+
# # kayobe_image: ${{ needs.build-kayobe-image.outputs.kayobe_image }}
195+
# # os_distribution: ubuntu
196+
# # os_release: noble
197+
# # ssh_username: ubuntu
198+
# # neutron_plugin: ovs
199+
# # OS_CLOUD: openstack
200+
# # if: ${{ needs.check-changes.outputs.aio == 'true' }}
201+
# # upgrade: true
202+
# # secrets: inherit
203+
# # if: ${{ ! failure() && ! cancelled() && github.repository == 'stackhpc/stackhpc-kayobe-config' }}
204+
205+
# all-in-one-upgrade-rocky-9-ovn:
206+
# name: aio upgrade (Rocky 9 OVN)
207+
# needs:
208+
# - check-changes
209+
# - build-kayobe-image
210+
# uses: ./.github/workflows/stackhpc-all-in-one.yml
211+
# with:
212+
# kayobe_image: ${{ needs.build-kayobe-image.outputs.kayobe_image }}
213+
# os_distribution: rocky
214+
# os_release: "9"
215+
# ssh_username: cloud-user
216+
# neutron_plugin: ovn
217+
# OS_CLOUD: openstack
218+
# if: ${{ needs.check-changes.outputs.aio == 'true' }}
218219
# upgrade: true
219220
# secrets: inherit
220221
# if: ${{ ! failure() && ! cancelled() && github.repository == 'stackhpc/stackhpc-kayobe-config' }}
221222

222-
all-in-one-upgrade-rocky-9-ovn:
223-
name: aio upgrade (Rocky 9 OVN)
224-
needs:
225-
- check-changes
226-
- build-kayobe-image
227-
uses: ./.github/workflows/stackhpc-all-in-one.yml
228-
with:
229-
kayobe_image: ${{ needs.build-kayobe-image.outputs.kayobe_image }}
230-
os_distribution: rocky
231-
os_release: "9"
232-
ssh_username: cloud-user
233-
neutron_plugin: ovn
234-
OS_CLOUD: openstack
235-
if: ${{ needs.check-changes.outputs.aio == 'true' }}
236-
upgrade: true
237-
secrets: inherit
238-
if: ${{ ! failure() && ! cancelled() && github.repository == 'stackhpc/stackhpc-kayobe-config' }}
223+
# all-in-one-upgrade-rocky-9-ovs:
224+
# name: aio upgrade (Rocky 9 OVS)
225+
# needs:
226+
# - check-changes
227+
# - build-kayobe-image
228+
# uses: ./.github/workflows/stackhpc-all-in-one.yml
229+
# with:
230+
# kayobe_image: ${{ needs.build-kayobe-image.outputs.kayobe_image }}
231+
# os_distribution: rocky
232+
# os_release: "9"
233+
# ssh_username: cloud-user
234+
# neutron_plugin: ovs
235+
# OS_CLOUD: openstack
236+
# if: ${{ needs.check-changes.outputs.aio == 'true' }}
237+
# upgrade: true
238+
# secrets: inherit
239+
# if: ${{ ! failure() && ! cancelled() && github.repository == 'stackhpc/stackhpc-kayobe-config' }}

‎.github/workflows/stackhpc-update-kolla.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ jobs:
1717
codename: Antelope
1818
- version: stackhpc/2024.1
1919
codename: Caracal
20-
- version: stackhpc/master
21-
codename: master
20+
- version: stackhpc/2025.1
21+
codename: Epoxy
2222
uses: ./.github/workflows/update-dependencies.yml
2323
with:
2424
openstack_version: ${{ matrix.version }}

‎.github/workflows/tag-and-release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ name: Tag & Release
33
'on':
44
push:
55
branches:
6-
- stackhpc/master
6+
- stackhpc/2025.1
77
permissions:
88
actions: read
99
contents: write

0 commit comments

Comments
 (0)