Merge remote-tracking branch 'origin/jammy-to-noble-ci' into test-upgrade-ci

Author: Alex-Welsh

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

@@ -64,6 +64,10 @@ on:
         description: Whether to perform an upgrade
         type: boolean
         default: false
+      host_os_upgrade:
+        description: Whether to perform a host OS upgrade
+        type: boolean
+        default: false
       stackhpc_cloud_tests_version:
         description: Git version of https://github.com/stackhpc/stackhpc-cloud-tests to use for testing
         type: string
@@ -336,15 +340,38 @@ jobs:
           KAYOBE_AUTOMATION_SSH_PRIVATE_KEY: ${{ steps.ssh_key.outputs.ssh_key }}
 
       - name: Run upgrade prerequisites
+        run: |
+          docker run -t --rm \
+          -v $(pwd):/stack/kayobe-automation-env/src/kayobe-config \
+          -e KAYOBE_ENVIRONMENT -e KAYOBE_VAULT_PASSWORD -e KAYOBE_AUTOMATION_SSH_PRIVATE_KEY \
+          ${{ steps.kayobe_image.outputs.kayobe_image }} \
+          /stack/kayobe-automation-env/src/kayobe-config/.automation/pipeline/script-run.sh tools/upgrade-prerequisites.sh
+        env:
+          KAYOBE_AUTOMATION_SSH_PRIVATE_KEY: ${{ steps.ssh_key.outputs.ssh_key }}
+        if: inputs.upgrade
+
+      - name: Upgrade host OS
         run: |
           docker run -t --rm \
             -v $(pwd):/stack/kayobe-automation-env/src/kayobe-config \
             -e KAYOBE_ENVIRONMENT -e KAYOBE_VAULT_PASSWORD -e KAYOBE_AUTOMATION_SSH_PRIVATE_KEY \
+            -e KAYOBE_PATH=/stack/kayobe-automation-env/src/kayobe \
             ${{ steps.kayobe_image.outputs.kayobe_image }} \
-            /stack/kayobe-automation-env/src/kayobe-config/.automation/pipeline/script-run.sh tools/upgrade-prerequisites.sh
+            /stack/kayobe-automation-env/src/kayobe-config/.automation/pipeline/script-run.sh tools/ubuntu-upgrade-overcloud.sh all
         env:
           KAYOBE_AUTOMATION_SSH_PRIVATE_KEY: ${{ steps.ssh_key.outputs.ssh_key }}
-        if: inputs.upgrade
+        if: inputs.host_os_upgrade
+  
+      - name: Deploy services that are built for later OS
+        run: |
+          docker run -t --rm \
+          -v $(pwd):/stack/kayobe-automation-env/src/kayobe-config \
+          -e KAYOBE_ENVIRONMENT -e KAYOBE_VAULT_PASSWORD -e KAYOBE_AUTOMATION_SSH_PRIVATE_KEY \
+          ${{ steps.kayobe_image.outputs.kayobe_image }} \
+          /stack/kayobe-automation-env/src/kayobe-config/.automation/pipeline/overcloud-service-deploy.sh
+        env:
+          KAYOBE_AUTOMATION_SSH_PRIVATE_KEY: ${{ steps.ssh_key.outputs.ssh_key }}
+        if: inputs.host_os_upgrade
 
       # If testing upgrade, checkout the current release branch
       # Stash changes to tracked files, and set clean=false to avoid removing untracked files.

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

@@ -195,41 +195,61 @@ jobs:
     secrets: inherit
     if: ${{ ! failure() && ! cancelled() && github.repository == 'stackhpc/stackhpc-kayobe-config' }}
 
-  # Test two upgrade scenarios: Ubuntu Noble OVS and Rocky 9 OVN.
+  # Test three upgrade scenarios: Ubuntu Noble OVN, Rocky 9 OVN and Rocky 9 OVS.
 
-  # On hold until Noble support lands in stackhpc/2024.1
-  # all-in-one-upgrade-ubuntu-noble-ovs:
-  #   name: aio upgrade (Ubuntu Noble OVS)
-  #   needs:
-  #     - check-changes
-  #     - build-kayobe-image
-  #   uses: ./.github/workflows/stackhpc-all-in-one.yml
-  #   with:
-  #     kayobe_image: ${{ needs.build-kayobe-image.outputs.kayobe_image }}
-  #     os_distribution: ubuntu
-  #     os_release: noble
-  #     ssh_username: ubuntu
-  #     neutron_plugin: ovs
-  #     OS_CLOUD: openstack
-  #     if: ${{ needs.check-changes.outputs.aio == 'true' }}
-  #     upgrade: true
-  #   secrets: inherit
-  #   if: ${{ ! failure() && ! cancelled() && github.repository == 'stackhpc/stackhpc-kayobe-config' }}
-
-  all-in-one-upgrade-rocky-9-ovn:
-    name: aio upgrade (Rocky 9 OVN)
+  all-in-one-upgrade-ubuntu-jammy-to-noble-ovn:
+    name: aio upgrade (Ubuntu Jammy to Noble OVN)
     needs:
       - check-changes
       - build-kayobe-image
     uses: ./.github/workflows/stackhpc-all-in-one.yml
     with:
       kayobe_image: ${{ needs.build-kayobe-image.outputs.kayobe_image }}
-      os_distribution: rocky
-      os_release: "9"
-      ssh_username: cloud-user
+      os_distribution: ubuntu
+      os_release: jammy
+      ssh_username: ubuntu
       neutron_plugin: ovn
       OS_CLOUD: openstack
       if: ${{ needs.check-changes.outputs.aio == 'true' }}
       upgrade: true
+      host_os_upgrade: true
     secrets: inherit
     if: ${{ ! failure() && ! cancelled() && github.repository == 'stackhpc/stackhpc-kayobe-config' }}
+
+  # Temporarily disable rocky upgrades
+
+  # all-in-one-upgrade-rocky-9-ovn:
+  #   name: aio upgrade (Rocky 9 OVN)
+  #   needs:
+  #     - check-changes
+  #     - build-kayobe-image
+  #   uses: ./.github/workflows/stackhpc-all-in-one.yml
+  #   with:
+  #     kayobe_image: ${{ needs.build-kayobe-image.outputs.kayobe_image }}
+  #     os_distribution: rocky
+  #     os_release: "9"
+  #     ssh_username: cloud-user
+  #     neutron_plugin: ovn
+  #     OS_CLOUD: openstack
+  #     if: ${{ needs.check-changes.outputs.aio == 'true' }}
+  #     upgrade: true
+  #   secrets: inherit
+  #   if: ${{ ! failure() && ! cancelled() && github.repository == 'stackhpc/stackhpc-kayobe-config' }}
+
+  # all-in-one-upgrade-rocky-9-ovs:
+  #   name: aio upgrade (Rocky 9 OVS)
+  #   needs:
+  #     - check-changes
+  #     - build-kayobe-image
+  #   uses: ./.github/workflows/stackhpc-all-in-one.yml
+  #   with:
+  #     kayobe_image: ${{ needs.build-kayobe-image.outputs.kayobe_image }}
+  #     os_distribution: rocky
+  #     os_release: "9"
+  #     ssh_username: cloud-user
+  #     neutron_plugin: ovs
+  #     OS_CLOUD: openstack
+  #     if: ${{ needs.check-changes.outputs.aio == 'true' }}
+  #     upgrade: true
+  #   secrets: inherit
+  #   if: ${{ ! failure() && ! cancelled() && github.repository == 'stackhpc/stackhpc-kayobe-config' }}