Tests: Add MicroCeph quincy to squid upgrade tests (#467)

canonical · Nov 7, 2024 · 9a3baeb · 9a3baeb
2 parents 0a69e33 + 4c3111c
commit 9a3baeb
Showing 1 changed file with 25 additions and 10 deletions.
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -84,14 +84,14 @@ jobs:
       - name: Unit tests
         run: |
           set -eux
-          make check-unit 
+          make check-unit
 
       - name: Upload coverage data
         uses: actions/upload-artifact@v4
         with:
           name: coverage-unit
           path: ${{env.GOCOVERDIR}}
-        if: env.GOCOVERDIR != '' 
+        if: env.GOCOVERDIR != ''
 
       - name: Upload system test dependencies
         uses: actions/upload-artifact@v4
@@ -100,15 +100,15 @@ jobs:
           path: |
             /home/runner/go/bin/microcloud
             /home/runner/go/bin/microcloudd
-          retention-days: 1 
+          retention-days: 1
 
   system-tests:
     env:
       DEBUG: "1"
       SKIP_VM_LAUNCH: "1"
       SNAPSHOT_RESTORE: "1"
     name: System
-    runs-on: GitHubMicrocloud 
+    runs-on: GitHubMicrocloud
     needs: code-tests
     strategy:
       fail-fast: false
@@ -133,23 +133,38 @@ jobs:
         microcloud: ["latest/edge"]
         # Additional test suites that will get included using a different set of versions.
         include:
-          # Upgrade MicroCloud from 1 to 2 on 22.04
+          # Upgrade MicroCloud from 1 to 2 on 22.04 using MicroCeph reef
           - suite: "upgrade"
             os: "22.04"
             go: "1.22.x"
             microceph: "reef/stable"
             microovn: "22.03/stable"
             lxd: "5.21/stable"
             microcloud: "1/stable"
-          # Upgrade MicroCloud from 1 to 2 on 24.04
+          # Upgrade MicroCloud from 1 to 2 on 24.04 using MicroCeph reef
           - suite: "upgrade"
             os: "24.04"
             go: "1.22.x"
             lxd: "5.21/stable"
             microceph: "reef/stable"
             microovn: "22.03/stable"
             microcloud: "1/stable"
-
+          # Upgrade MicroCloud from 1 to 2 on 22.04 using MicroCeph quincy
+          - suite: "upgrade"
+            os: "22.04"
+            go: "1.22.x"
+            microceph: "quincy/stable"
+            microovn: "22.03/stable"
+            lxd: "5.21/stable"
+            microcloud: "1/stable"
+          # Upgrade MicroCloud from 1 to 2 on 24.04 using MicroCeph quincy
+          - suite: "upgrade"
+            os: "24.04"
+            go: "1.22.x"
+            lxd: "5.21/stable"
+            microceph: "quincy/stable"
+            microovn: "22.03/stable"
+            microcloud: "1/stable"
     steps:
       - name: Performance tuning
         run: |
@@ -316,13 +331,13 @@ jobs:
         uses: actions/upload-artifact@v4
         with:
           name: coverage-${{ matrix.go }}-${{ matrix.suite }}-${{ env.TIMESTAMP }}
-          path: ${{ env.GOCOVERDIR }} 
+          path: ${{ env.GOCOVERDIR }}
         if: env.GOCOVERDIR != ''
 
   tics:
     name: Tiobe TICS
     runs-on: ubuntu-22.04
-    needs: system-tests 
+    needs: system-tests
     if: ${{ ( github.event_name == 'workflow_dispatch' || github.event_name == 'schedule' ) && github.ref_name == 'main' && github.repository == 'canonical/microcloud' }}
     steps:
       - name: Checkout
@@ -344,7 +359,7 @@ jobs:
 
       - name: Extract coverage data
         run: |
-          find ${{ env.GOCOVERDIR }}/micro*/cover/ -type f -exec mv {} ${{ env.GOCOVERDIR }} \; 
+          find ${{ env.GOCOVERDIR }}/micro*/cover/ -type f -exec mv {} ${{ env.GOCOVERDIR }} \;
           rm -rf ${{ env.GOCOVERDIR }}/micro*
           ls -la ${{ env.GOCOVERDIR }}