@@ -195,41 +195,61 @@ jobs:
195195 secrets : inherit
196196 if : ${{ ! failure() && ! cancelled() && github.repository == 'stackhpc/stackhpc-kayobe-config' }}
197197
198- # Test two upgrade scenarios: Ubuntu Noble OVS and Rocky 9 OVN .
198+ # Test three upgrade scenarios: Ubuntu Noble OVN, Rocky 9 OVN and Rocky 9 OVS .
199199
200- # On hold until Noble support lands in stackhpc/2024.1
201- # all-in-one-upgrade-ubuntu-noble-ovs:
202- # name: aio upgrade (Ubuntu Noble OVS)
203- # needs:
204- # - check-changes
205- # - build-kayobe-image
206- # uses: ./.github/workflows/stackhpc-all-in-one.yml
207- # with:
208- # kayobe_image: ${{ needs.build-kayobe-image.outputs.kayobe_image }}
209- # os_distribution: ubuntu
210- # os_release: noble
211- # ssh_username: ubuntu
212- # neutron_plugin: ovs
213- # OS_CLOUD: openstack
214- # if: ${{ needs.check-changes.outputs.aio == 'true' }}
215- # upgrade: true
216- # secrets: inherit
217- # if: ${{ ! failure() && ! cancelled() && github.repository == 'stackhpc/stackhpc-kayobe-config' }}
218-
219- all-in-one-upgrade-rocky-9-ovn :
220- name : aio upgrade (Rocky 9 OVN)
200+ all-in-one-upgrade-ubuntu-jammy-to-noble-ovn :
201+ name : aio upgrade (Ubuntu Jammy to Noble OVN)
221202 needs :
222203 - check-changes
223204 - build-kayobe-image
224205 uses : ./.github/workflows/stackhpc-all-in-one.yml
225206 with :
226207 kayobe_image : ${{ needs.build-kayobe-image.outputs.kayobe_image }}
227- os_distribution : rocky
228- os_release : " 9 "
229- ssh_username : cloud-user
208+ os_distribution : ubuntu
209+ os_release : jammy
210+ ssh_username : ubuntu
230211 neutron_plugin : ovn
231212 OS_CLOUD : openstack
232213 if : ${{ needs.check-changes.outputs.aio == 'true' }}
233214 upgrade : true
215+ host_os_upgrade : true
234216 secrets : inherit
235217 if : ${{ ! failure() && ! cancelled() && github.repository == 'stackhpc/stackhpc-kayobe-config' }}
218+
219+ # Temporarily disable rocky upgrades
220+
221+ # all-in-one-upgrade-rocky-9-ovn:
222+ # name: aio upgrade (Rocky 9 OVN)
223+ # needs:
224+ # - check-changes
225+ # - build-kayobe-image
226+ # uses: ./.github/workflows/stackhpc-all-in-one.yml
227+ # with:
228+ # kayobe_image: ${{ needs.build-kayobe-image.outputs.kayobe_image }}
229+ # os_distribution: rocky
230+ # os_release: "9"
231+ # ssh_username: cloud-user
232+ # neutron_plugin: ovn
233+ # OS_CLOUD: openstack
234+ # if: ${{ needs.check-changes.outputs.aio == 'true' }}
235+ # upgrade: true
236+ # secrets: inherit
237+ # 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