@@ -198,26 +198,25 @@ jobs:
198198 secrets : inherit
199199 if : ${{ ! failure() && ! cancelled() && github.repository == 'stackhpc/stackhpc-kayobe-config' }}
200200
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)
206- # needs:
207- # - check-changes
208- # - build-kayobe-image
209- # uses: ./.github/workflows/stackhpc-all-in-one.yml
210- # with:
211- # kayobe_image: ${{ needs.build-kayobe-image.outputs.kayobe_image }}
212- # os_distribution: ubuntu
213- # os_release: noble
214- # ssh_username: ubuntu
215- # neutron_plugin: ovs
216- # OS_CLOUD: openstack
217- # if: ${{ needs.check-changes.outputs.aio == 'true' }}
218- # upgrade: true
219- # secrets: inherit
220- # if: ${{ ! failure() && ! cancelled() && github.repository == 'stackhpc/stackhpc-kayobe-config' }}
201+ # Test three upgrade scenarios: Ubuntu Noble OVN, Rocky 9 OVN and Rocky 9 OVS.
202+
203+ all-in-one-upgrade-ubuntu-jammy-to-noble-ovn :
204+ name : aio upgrade (Ubuntu Jammy to Noble OVN)
205+ needs :
206+ - check-changes
207+ - build-kayobe-image
208+ uses : ./.github/workflows/stackhpc-all-in-one.yml
209+ with :
210+ kayobe_image : ${{ needs.build-kayobe-image.outputs.kayobe_image }}
211+ os_distribution : ubuntu
212+ os_release : jammy
213+ ssh_username : ubuntu
214+ neutron_plugin : ovn
215+ OS_CLOUD : openstack
216+ if : ${{ needs.check-changes.outputs.aio == 'true' }}
217+ upgrade : true
218+ secrets : inherit
219+ if : ${{ ! failure() && ! cancelled() && github.repository == 'stackhpc/stackhpc-kayobe-config' }}
221220
222221 all-in-one-upgrade-rocky-9-ovn :
223222 name : aio upgrade (Rocky 9 OVN)
@@ -236,3 +235,21 @@ jobs:
236235 upgrade : true
237236 secrets : inherit
238237 if : ${{ ! failure() && ! cancelled() && github.repository == 'stackhpc/stackhpc-kayobe-config' }}
238+
239+ all-in-one-upgrade-rocky-9-ovs :
240+ name : aio upgrade (Rocky 9 OVS)
241+ needs :
242+ - check-changes
243+ - build-kayobe-image
244+ uses : ./.github/workflows/stackhpc-all-in-one.yml
245+ with :
246+ kayobe_image : ${{ needs.build-kayobe-image.outputs.kayobe_image }}
247+ os_distribution : rocky
248+ os_release : " 9"
249+ ssh_username : cloud-user
250+ neutron_plugin : ovs
251+ OS_CLOUD : openstack
252+ if : ${{ needs.check-changes.outputs.aio == 'true' }}
253+ upgrade : true
254+ secrets : inherit
255+ if : ${{ ! failure() && ! cancelled() && github.repository == 'stackhpc/stackhpc-kayobe-config' }}
0 commit comments