File tree Expand file tree Collapse file tree 2 files changed +42
-20
lines changed Expand file tree Collapse file tree 2 files changed +42
-20
lines changed Original file line number Diff line number Diff line change @@ -326,6 +326,29 @@ jobs:
326326 env :
327327 KAYOBE_AUTOMATION_SSH_PRIVATE_KEY : ${{ steps.ssh_key.outputs.ssh_key }}
328328
329+ - name : Upgrade host OS
330+ run : |
331+ docker run -t --rm \
332+ -v $(pwd):/stack/kayobe-automation-env/src/kayobe-config \
333+ -e KAYOBE_ENVIRONMENT -e KAYOBE_VAULT_PASSWORD -e KAYOBE_AUTOMATION_SSH_PRIVATE_KEY \
334+ -e KAYOBE_PATH=/stack/kayobe-automation-env/src/kayobe \
335+ ${{ steps.kayobe_image.outputs.kayobe_image }} \
336+ /stack/kayobe-automation-env/src/kayobe-config/.automation/pipeline/script-run.sh tools/ubuntu-upgrade-overcloud.sh all
337+ env :
338+ KAYOBE_AUTOMATION_SSH_PRIVATE_KEY : ${{ steps.ssh_key.outputs.ssh_key }}
339+ if : inputs.upgrade && inputs.os_release == 'jammy'
340+
341+ - name : Deploy services that are built for later OS
342+ run : |
343+ docker run -t --rm \
344+ -v $(pwd):/stack/kayobe-automation-env/src/kayobe-config \
345+ -e KAYOBE_ENVIRONMENT -e KAYOBE_VAULT_PASSWORD -e KAYOBE_AUTOMATION_SSH_PRIVATE_KEY \
346+ ${{ steps.kayobe_image.outputs.kayobe_image }} \
347+ /stack/kayobe-automation-env/src/kayobe-config/.automation/pipeline/overcloud-service-deploy.sh
348+ env :
349+ KAYOBE_AUTOMATION_SSH_PRIVATE_KEY : ${{ steps.ssh_key.outputs.ssh_key }}
350+ if : inputs.upgrade && inputs.os_release == 'jammy'
351+
329352 - name : Run upgrade prerequisites
330353 run : |
331354 docker run -t --rm \
Original file line number Diff line number Diff line change @@ -181,26 +181,25 @@ jobs:
181181 secrets : inherit
182182 if : ${{ ! failure() && ! cancelled() && github.repository == 'stackhpc/stackhpc-kayobe-config' }}
183183
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' }}
184+ # Test two upgrade scenarios: Ubuntu Jammy to Noble OVN and Rocky 9 OVN.
185+
186+ all-in-one-upgrade-ubuntu-jammy-to-noble-ovn :
187+ name : aio upgrade (Ubuntu Jammy to Noble OVN)
188+ needs :
189+ - check-changes
190+ - build-kayobe-image
191+ uses : ./.github/workflows/stackhpc-all-in-one.yml
192+ with :
193+ kayobe_image : ${{ needs.build-kayobe-image.outputs.kayobe_image }}
194+ os_distribution : ubuntu
195+ os_release : jammy
196+ ssh_username : ubuntu
197+ neutron_plugin : ovn
198+ OS_CLOUD : openstack
199+ if : ${{ needs.check-changes.outputs.aio == 'true' }}
200+ upgrade : true
201+ secrets : inherit
202+ if : ${{ ! failure() && ! cancelled() && github.repository == 'stackhpc/stackhpc-kayobe-config' }}
204203
205204 all-in-one-upgrade-rocky-9-ovn :
206205 name : aio upgrade (Rocky 9 OVN)
You can’t perform that action at this time.
0 commit comments