Skip to content

Commit f867916

Browse files
owenjonesowenjones
committed
Implement AIO testing for Rocky 10
New Rocky 10 AIO jobs added to the PR workflow. An override for `kolla_base_distro_version` has been added to the `ci-builder` environment so we can deploy Rocky 10 images (K-A maps to Rocky 9 by default).
1 parent bba494d commit f867916

3 files changed

Lines changed: 118 additions & 79 deletions

File tree

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

Lines changed: 114 additions & 78 deletions
Original file line numberDiff line numberDiff line change
@@ -137,26 +137,62 @@ jobs:
137137
secrets: inherit
138138
if: ${{ ! failure() && ! cancelled() && github.repository == 'stackhpc/stackhpc-kayobe-config' }}
139139

140-
all-in-one-ubuntu-noble-ovn:
141-
name: aio (Ubuntu Noble OVN)
142-
permissions: {}
143-
needs:
144-
- check-changes
145-
- build-kayobe-image
146-
uses: ./.github/workflows/stackhpc-all-in-one.yml
147-
with:
148-
kayobe_image: ${{ needs.build-kayobe-image.outputs.kayobe_image }}
149-
os_distribution: ubuntu
150-
os_release: noble
151-
ssh_username: ubuntu
152-
neutron_plugin: ovn
153-
OS_CLOUD: openstack
154-
if: ${{ needs.check-changes.outputs.aio == 'true' }}
155-
secrets: inherit
156-
if: ${{ ! failure() && ! cancelled() && github.repository == 'stackhpc/stackhpc-kayobe-config' }}
140+
# all-in-one-ubuntu-noble-ovn:
141+
# name: aio (Ubuntu Noble OVN)
142+
# permissions: {}
143+
# needs:
144+
# - check-changes
145+
# - build-kayobe-image
146+
# uses: ./.github/workflows/stackhpc-all-in-one.yml
147+
# with:
148+
# kayobe_image: ${{ needs.build-kayobe-image.outputs.kayobe_image }}
149+
# os_distribution: ubuntu
150+
# os_release: noble
151+
# ssh_username: ubuntu
152+
# neutron_plugin: ovn
153+
# OS_CLOUD: openstack
154+
# if: ${{ needs.check-changes.outputs.aio == 'true' }}
155+
# secrets: inherit
156+
# if: ${{ ! failure() && ! cancelled() && github.repository == 'stackhpc/stackhpc-kayobe-config' }}
157+
158+
# all-in-one-rocky-9-ovs:
159+
# name: aio (Rocky 9 OVS)
160+
# permissions: {}
161+
# needs:
162+
# - check-changes
163+
# - build-kayobe-image
164+
# uses: ./.github/workflows/stackhpc-all-in-one.yml
165+
# with:
166+
# kayobe_image: ${{ needs.build-kayobe-image.outputs.kayobe_image }}
167+
# os_distribution: rocky
168+
# os_release: "9"
169+
# ssh_username: cloud-user
170+
# neutron_plugin: ovs
171+
# OS_CLOUD: openstack
172+
# if: ${{ needs.check-changes.outputs.aio == 'true' }}
173+
# secrets: inherit
174+
# if: ${{ ! failure() && ! cancelled() && github.repository == 'stackhpc/stackhpc-kayobe-config' }}
175+
176+
# all-in-one-rocky-9-ovn:
177+
# name: aio (Rocky 9 OVN)
178+
# permissions: {}
179+
# needs:
180+
# - check-changes
181+
# - build-kayobe-image
182+
# uses: ./.github/workflows/stackhpc-all-in-one.yml
183+
# with:
184+
# kayobe_image: ${{ needs.build-kayobe-image.outputs.kayobe_image }}
185+
# os_distribution: rocky
186+
# os_release: "9"
187+
# ssh_username: cloud-user
188+
# neutron_plugin: ovn
189+
# OS_CLOUD: openstack
190+
# if: ${{ needs.check-changes.outputs.aio == 'true' }}
191+
# secrets: inherit
192+
# if: ${{ ! failure() && ! cancelled() && github.repository == 'stackhpc/stackhpc-kayobe-config' }}
157193

158-
all-in-one-rocky-9-ovs:
159-
name: aio (Rocky 9 OVS)
194+
all-in-one-rocky-10-ovs:
195+
name: aio (Rocky 10 OVS)
160196
permissions: {}
161197
needs:
162198
- check-changes
@@ -165,16 +201,16 @@ jobs:
165201
with:
166202
kayobe_image: ${{ needs.build-kayobe-image.outputs.kayobe_image }}
167203
os_distribution: rocky
168-
os_release: "9"
204+
os_release: "10"
169205
ssh_username: cloud-user
170206
neutron_plugin: ovs
171207
OS_CLOUD: openstack
172208
if: ${{ needs.check-changes.outputs.aio == 'true' }}
173209
secrets: inherit
174210
if: ${{ ! failure() && ! cancelled() && github.repository == 'stackhpc/stackhpc-kayobe-config' }}
175211

176-
all-in-one-rocky-9-ovn:
177-
name: aio (Rocky 9 OVN)
212+
all-in-one-rocky-10-ovn:
213+
name: aio (Rocky 10 OVN)
178214
permissions: {}
179215
needs:
180216
- check-changes
@@ -183,69 +219,69 @@ jobs:
183219
with:
184220
kayobe_image: ${{ needs.build-kayobe-image.outputs.kayobe_image }}
185221
os_distribution: rocky
186-
os_release: "9"
222+
os_release: "10"
187223
ssh_username: cloud-user
188224
neutron_plugin: ovn
189225
OS_CLOUD: openstack
190226
if: ${{ needs.check-changes.outputs.aio == 'true' }}
191227
secrets: inherit
192228
if: ${{ ! failure() && ! cancelled() && github.repository == 'stackhpc/stackhpc-kayobe-config' }}
193229

194-
# Test two upgrade scenarios: Ubuntu Jammy to Noble OVN and Rocky 9 OVN.
230+
# # Test three upgrade scenarios: Ubuntu Jammy to Noble OVN and Rocky 9 OVN.
195231

196-
all-in-one-upgrade-ubuntu-jammy-to-noble-ovn:
197-
name: aio upgrade (Ubuntu Jammy to Noble OVN)
198-
permissions: {}
199-
needs:
200-
- check-changes
201-
- build-kayobe-image
202-
uses: ./.github/workflows/stackhpc-all-in-one.yml
203-
with:
204-
kayobe_image: ${{ needs.build-kayobe-image.outputs.kayobe_image }}
205-
os_distribution: ubuntu
206-
os_release: jammy
207-
ssh_username: ubuntu
208-
neutron_plugin: ovn
209-
OS_CLOUD: openstack
210-
if: ${{ needs.check-changes.outputs.aio == 'true' }}
211-
upgrade: true
212-
secrets: inherit
213-
if: ${{ ! failure() && ! cancelled() && github.repository == 'stackhpc/stackhpc-kayobe-config' }}
232+
# all-in-one-upgrade-ubuntu-jammy-to-noble-ovn:
233+
# name: aio upgrade (Ubuntu Jammy to Noble OVN)
234+
# permissions: {}
235+
# needs:
236+
# - check-changes
237+
# - build-kayobe-image
238+
# uses: ./.github/workflows/stackhpc-all-in-one.yml
239+
# with:
240+
# kayobe_image: ${{ needs.build-kayobe-image.outputs.kayobe_image }}
241+
# os_distribution: ubuntu
242+
# os_release: jammy
243+
# ssh_username: ubuntu
244+
# neutron_plugin: ovn
245+
# OS_CLOUD: openstack
246+
# if: ${{ needs.check-changes.outputs.aio == 'true' }}
247+
# upgrade: true
248+
# secrets: inherit
249+
# if: ${{ ! failure() && ! cancelled() && github.repository == 'stackhpc/stackhpc-kayobe-config' }}
214250

215-
all-in-one-upgrade-rocky-9-ovn:
216-
name: aio upgrade (Rocky 9 OVN)
217-
permissions: {}
218-
needs:
219-
- check-changes
220-
- build-kayobe-image
221-
uses: ./.github/workflows/stackhpc-all-in-one.yml
222-
with:
223-
kayobe_image: ${{ needs.build-kayobe-image.outputs.kayobe_image }}
224-
os_distribution: rocky
225-
os_release: "9"
226-
ssh_username: cloud-user
227-
neutron_plugin: ovn
228-
OS_CLOUD: openstack
229-
if: ${{ needs.check-changes.outputs.aio == 'true' }}
230-
upgrade: true
231-
secrets: inherit
232-
if: ${{ ! failure() && ! cancelled() && github.repository == 'stackhpc/stackhpc-kayobe-config' }}
251+
# all-in-one-upgrade-rocky-9-ovn:
252+
# name: aio upgrade (Rocky 9 OVN)
253+
# permissions: {}
254+
# needs:
255+
# - check-changes
256+
# - build-kayobe-image
257+
# uses: ./.github/workflows/stackhpc-all-in-one.yml
258+
# with:
259+
# kayobe_image: ${{ needs.build-kayobe-image.outputs.kayobe_image }}
260+
# os_distribution: rocky
261+
# os_release: "9"
262+
# ssh_username: cloud-user
263+
# neutron_plugin: ovn
264+
# OS_CLOUD: openstack
265+
# if: ${{ needs.check-changes.outputs.aio == 'true' }}
266+
# upgrade: true
267+
# secrets: inherit
268+
# if: ${{ ! failure() && ! cancelled() && github.repository == 'stackhpc/stackhpc-kayobe-config' }}
233269

234-
all-in-one-upgrade-rocky-9-ovs:
235-
name: aio upgrade (Rocky 9 OVS)
236-
permissions: {}
237-
needs:
238-
- check-changes
239-
- build-kayobe-image
240-
uses: ./.github/workflows/stackhpc-all-in-one.yml
241-
with:
242-
kayobe_image: ${{ needs.build-kayobe-image.outputs.kayobe_image }}
243-
os_distribution: rocky
244-
os_release: "9"
245-
ssh_username: cloud-user
246-
neutron_plugin: ovs
247-
OS_CLOUD: openstack
248-
if: ${{ needs.check-changes.outputs.aio == 'true' }}
249-
upgrade: true
250-
secrets: inherit
251-
if: ${{ ! failure() && ! cancelled() && github.repository == 'stackhpc/stackhpc-kayobe-config' }}
270+
# all-in-one-upgrade-rocky-9-ovs:
271+
# name: aio upgrade (Rocky 9 OVS)
272+
# permissions: {}
273+
# needs:
274+
# - check-changes
275+
# - build-kayobe-image
276+
# uses: ./.github/workflows/stackhpc-all-in-one.yml
277+
# with:
278+
# kayobe_image: ${{ needs.build-kayobe-image.outputs.kayobe_image }}
279+
# os_distribution: rocky
280+
# os_release: "9"
281+
# ssh_username: cloud-user
282+
# neutron_plugin: ovs
283+
# OS_CLOUD: openstack
284+
# if: ${{ needs.check-changes.outputs.aio == 'true' }}
285+
# upgrade: true
286+
# secrets: inherit
287+
# if: ${{ ! failure() && ! cancelled() && github.repository == 'stackhpc/stackhpc-kayobe-config' }}

‎etc/kayobe/environments/ci-aio/inventory/group_vars/controllers/network-interfaces‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ ethernet_interface: "{{ ansible_facts['default_ipv4']['interface'] }}"
1010
# Controller interface on all-in-one network.
1111
aio_interface: breth1
1212
# Use dummy1 if it exists, otherwise the bridge will have no ports.
13-
aio_bridge_ports: "{{ ['dummy1'] if ('dummy1' in hostvars[inventory_hostname].ansible_facts) or (os_distribution == 'rocky' and os_release == '9') else [] }}"
13+
aio_bridge_ports: "{{ ['dummy1'] if 'dummy1' in hostvars[inventory_hostname].ansible_facts or os_distribution == 'rocky' else [] }}"
1414

1515
###############################################################################
1616
# Dummy variable to allow Ansible to accept this file.

‎etc/kayobe/environments/ci-aio/stackhpc-ci.yml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,9 @@ stackhpc_repo_ubuntu_noble_version: "{{ stackhpc_pulp_repo_ubuntu_noble_version
7070
# Rocky-and-CI-specific Pulp urls
7171
stackhpc_include_os_minor_version_in_repo_url: true
7272

73+
# Override the release used by Kolla to be the control host release
74+
kolla_base_distro_version: "{{ os_release }}"
75+
7376
# Host and port of container registry.
7477
# Push built images to the development Pulp service registry.
7578
stackhpc_docker_registry: "{{ stackhpc_repo_mirror_url | regex_replace('^https?://', '') }}"

0 commit comments

Comments
 (0)