🤖 Fix artifacts names

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

Hide file tree

Showing 2 changed files with 8 additions and 7 deletions.
diff --git a/.github/workflows/image.yaml b/.github/workflows/image.yaml
@@ -108,7 +108,7 @@ jobs:
             flavorRelease: "testing"
           - flavor: "ubuntu"
             flavorRelease: "20.04"
-          - flavor: "ubuntu-22-lts"
+          - flavor: "ubuntu"
             flavorRelease: "22.04"
   bundles:
     uses: ./.github/workflows/reusable-qemu-bundles-test.yaml
@@ -122,7 +122,7 @@ jobs:
       matrix:
         include:
           - flavor: opensuse # Kubo test needs systemd version 252+ which atm is not available in Leap
-            flavorRelease: opensuse
+            flavorRelease: leap-15.5
   reset:
     uses: ./.github/workflows/reusable-qemu-reset-test.yaml
     with:
@@ -178,7 +178,7 @@ jobs:
             family: ubuntu
             variant: core
             model: generic
-            baseImage: ubuntu/23.04
+            baseImage: ubuntu:23.04
   upgrade:
     uses: ./.github/workflows/reusable-upgrade-with-cli-test.yaml
     with:
@@ -205,8 +205,9 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - flavor: alpine
-            flavorRelease: "3.18"
+          # cant do alpine yet as it hasnt been released with the proper name
+          #- flavor: alpine
+          #  flavorRelease: "3.18"
           - flavor: opensuse
             flavorRelease: leap-15.5
   encryption:

diff --git a/.github/workflows/reusable-upgrade-latest-test.yaml b/.github/workflows/reusable-upgrade-latest-test.yaml
@@ -55,7 +55,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.flavor }}*-amd64-generic-v*.iso'
           out-file-path: ""
       - name: Display structure of downloaded files
         run: ls -las .
@@ -72,7 +72,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.flavor }}*-amd64-generic-v*.iso | grep -v ipxe)
           earthly +run-qemu-test --PREBUILT_ISO=$ISO \
             --FLAVOR=${{ inputs.flavor }} \
             --CONTAINER_IMAGE=ttl.sh/kairos-${{ inputs.flavor }}-${{ inputs.flavor_release }}-${{ github.sha }}:24h \