DNM: reduce jobs

Author: MoteHue

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

@@ -89,25 +89,10 @@ jobs:
     secrets: inherit
     if: ${{ ! failure() && ! cancelled() && github.repository == 'stackhpc/stackhpc-kayobe-config' }}
 
-  all-in-one-ubuntu-jammy-ovs:
-    name: aio (Ubuntu Jammy 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: jammy
-      ssh_username: ubuntu
-      neutron_plugin: ovs
-      OS_CLOUD: openstack
-      if: ${{ needs.check-changes.outputs.aio == 'true' }}
-    secrets: inherit
-    if: ${{ ! failure() && ! cancelled() && github.repository == 'stackhpc/stackhpc-kayobe-config' }}
+  # Test two upgrade scenarios: Ubuntu Jammy OVS and Rocky 9 OVN.
 
-  all-in-one-ubuntu-jammy-ovn:
-    name: aio (Ubuntu Jammy OVN)
+  all-in-one-upgrade-ubuntu-jammy-ovs:
+    name: aio upgrade (Ubuntu Jammy OVS)
     needs:
       - check-changes
       - build-kayobe-image
@@ -117,31 +102,15 @@ jobs:
       os_distribution: ubuntu
       os_release: jammy
       ssh_username: ubuntu
-      neutron_plugin: ovn
-      OS_CLOUD: openstack
-      if: ${{ needs.check-changes.outputs.aio == 'true' }}
-    secrets: inherit
-    if: ${{ ! failure() && ! cancelled() && github.repository == 'stackhpc/stackhpc-kayobe-config' }}
-
-  all-in-one-rocky-9-ovs:
-    name: aio (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' }}
 
-  all-in-one-rocky-9-ovn:
-    name: aio (Rocky 9 OVN)
+  all-in-one-upgrade-rocky-9-ovn:
+    name: aio upgrade (Rocky 9 OVN)
     needs:
       - check-changes
       - build-kayobe-image
@@ -154,12 +123,11 @@ jobs:
       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' }}
 
-  # Test two upgrade scenarios: Ubuntu Jammy OVS and Rocky 9 OVN.
-
-  all-in-one-upgrade-ubuntu-jammy-ovs:
+  all-in-one-upgrade-ubuntu-jammy-ovn:
     name: aio upgrade (Ubuntu Jammy OVS)
     needs:
       - check-changes
@@ -170,14 +138,14 @@ jobs:
       os_distribution: ubuntu
       os_release: jammy
       ssh_username: ubuntu
-      neutron_plugin: ovs
+      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-ovn:
+  all-in-one-upgrade-rocky-9-ovs:
     name: aio upgrade (Rocky 9 OVN)
     needs:
       - check-changes
@@ -188,7 +156,7 @@ jobs:
       os_distribution: rocky
       os_release: "9"
       ssh_username: cloud-user
-      neutron_plugin: ovn
+      neutron_plugin: ovs
       OS_CLOUD: openstack
       if: ${{ needs.check-changes.outputs.aio == 'true' }}
       upgrade: true