Skip to content

Commit 5c06cd5

Browse files
committed
Add ubuntu upgrade process on CI-AIO
Plus replace upgrade testing og Ubuntu OVS AIO with Rocky9 OVS AIO as we don't have Ubuntu OVS system anymore.
1 parent 83e67f2 commit 5c06cd5

File tree

2 files changed

+60
-20
lines changed

2 files changed

+60
-20
lines changed

.github/workflows/stackhpc-all-in-one.yml

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -335,6 +335,29 @@ jobs:
335335
env:
336336
KAYOBE_AUTOMATION_SSH_PRIVATE_KEY: ${{ steps.ssh_key.outputs.ssh_key }}
337337

338+
- name: Upgrade host OS
339+
run: |
340+
docker run -t --rm \
341+
-v $(pwd):/stack/kayobe-automation-env/src/kayobe-config \
342+
-e KAYOBE_ENVIRONMENT -e KAYOBE_VAULT_PASSWORD -e KAYOBE_AUTOMATION_SSH_PRIVATE_KEY \
343+
-e KAYOBE_PATH=/stack/kayobe-automation-env/src/kayobe \
344+
${{ steps.kayobe_image.outputs.kayobe_image }} \
345+
/stack/kayobe-automation-env/src/kayobe-config/.automation/pipeline/script-run.sh tools/ubuntu-upgrade-overcloud.sh all
346+
env:
347+
KAYOBE_AUTOMATION_SSH_PRIVATE_KEY: ${{ steps.ssh_key.outputs.ssh_key }}
348+
if: inputs.upgrade && inputs.os_release == 'jammy'
349+
350+
- name: Deploy services that are built for later OS
351+
run: |
352+
docker run -t --rm \
353+
-v $(pwd):/stack/kayobe-automation-env/src/kayobe-config \
354+
-e KAYOBE_ENVIRONMENT -e KAYOBE_VAULT_PASSWORD -e KAYOBE_AUTOMATION_SSH_PRIVATE_KEY \
355+
${{ steps.kayobe_image.outputs.kayobe_image }} \
356+
/stack/kayobe-automation-env/src/kayobe-config/.automation/pipeline/overcloud-service-deploy.sh
357+
env:
358+
KAYOBE_AUTOMATION_SSH_PRIVATE_KEY: ${{ steps.ssh_key.outputs.ssh_key }}
359+
if: inputs.upgrade && inputs.os_release == 'jammy'
360+
338361
- name: Run upgrade prerequisites
339362
run: |
340363
docker run -t --rm \

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

Lines changed: 37 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -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

Comments
 (0)