🤖 Use family to identify the isos

Signed-off-by: Itxaka <[email protected]>
kairos-io · Oct 25, 2023 · e678779 · e678779
1 parent 29c7139
commit e678779
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 5 deletions.
diff --git a/.github/workflows/image.yaml b/.github/workflows/image.yaml
@@ -210,6 +210,7 @@ jobs:
           #  flavorRelease: "3.18"
           - flavor: opensuse
             flavorRelease: leap-15.5
+            family: opensuse-leap
   encryption:
     uses: ./.github/workflows/reusable-encryption-test.yaml
     with:
@@ -299,8 +300,10 @@ jobs:
         include:
           - flavor: "opensuse"
             flavorRelease: "leap-15.5"
-          - flavor: "alpine"
-            flavorRelease: "3.18"
+            family: "opensuse-leap"
+          # cant do alpine yet as it hasnt been released with the proper name
+          #- flavor: "alpine"
+          #  flavorRelease: "3.18"
 
   notify:
     runs-on: ubuntu-latest

diff --git a/.github/workflows/reusable-provider-upgrade-latest-test.yaml b/.github/workflows/reusable-provider-upgrade-latest-test.yaml
@@ -9,6 +9,9 @@ on:
       flavor_release:
         required: true
         type: string
+      family:
+        required: true
+        type: string
 
 jobs:
   test:
@@ -54,7 +57,7 @@ jobs:
           latest: true
           repository: "kairos-io/kairos"
           #fileName: 'kairos-standard-*${{ inputs.flavor }}-${{ inputs.flavor_release }}.*k3s1.iso' # Enable once we have a release with the new naming
-          fileName: 'kairos-standard-*${{ inputs.flavor }}.*k3s1.iso'
+          fileName: 'kairos-standard-${{ inputs.family }}.*k3s1.iso'
           out-file-path: ""
       - name: Run tests
         run: |

diff --git a/.github/workflows/reusable-upgrade-latest-test.yaml b/.github/workflows/reusable-upgrade-latest-test.yaml
@@ -9,6 +9,9 @@ on:
       flavor_release:
         required: true
         type: string
+      family:
+        required: true
+        type: string
 
 jobs:
   test:
@@ -55,7 +58,7 @@ jobs:
           # The default value is 'false'
           latest: true
           # TODO: This should change after we release with the new artifact names otherwise it won't work
-          fileName: 'kairos-core-${{ inputs.flavor }}*-amd64-generic-v*.iso'
+          fileName: 'kairos-core-${{ inputs.family }}*-amd64-generic-v*.iso'
           out-file-path: ""
       - name: Display structure of downloaded files
         run: ls -las .
@@ -72,7 +75,7 @@ jobs:
           # release-downloader globing matches more than one iso. Make sure
           # we use the right one.
           # TODO: This needs to be adapted after we release with the new artifact names
-          ISO=$(ls kairos-core-${{ inputs.flavor }}*-amd64-generic-v*.iso | grep -v ipxe)
+          ISO=$(ls kairos-core-${{ inputs.family }}-amd64-generic-v*.iso | grep -v ipxe | head -n 1)
           earthly +run-qemu-test --PREBUILT_ISO=$ISO \
             --FLAVOR=${{ inputs.flavor }} \
             --CONTAINER_IMAGE=ttl.sh/kairos-${{ inputs.flavor }}-${{ inputs.flavor_release }}-${{ github.sha }}:24h \