Skip to content

Commit 719dfe2

Browse files
committed
Add ubuntu upgrade process on CI-AIO
1 parent c1ddc1a commit 719dfe2

File tree

2 files changed

+42
-20
lines changed

2 files changed

+42
-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: 19 additions & 20 deletions
Original file line numberDiff line numberDiff 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)

0 commit comments

Comments
 (0)