Adapt pending ISO names on pipeline to the new convention

kairos-io · Nov 6, 2023 · ae0d0c7 · ae0d0c7
1 parent f7d82d4
commit ae0d0c7
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/.github/workflows/reusable-provider-upgrade-latest-test.yaml b/.github/workflows/reusable-provider-upgrade-latest-test.yaml
@@ -56,8 +56,7 @@ jobs:
         with:
           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.family }}.*k3s1.iso'
+          fileName: 'kairos-${{ inputs.flavor }}-${{ inputs.flavor_release }}*standard*.*k3s1.iso' # Enable once we have a release with the new naming
           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
@@ -75,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.family }}*-amd64-generic-v*.iso | grep -v ipxe | head -n 1)
+          ISO=$(ls kairos-${{ inputs.family }}*-core-amd64-generic-v*.iso | grep -v ipxe | head -n 1)
           earthly +run-qemu-test --PREBUILT_ISO=$ISO \
             --CONTAINER_IMAGE=ttl.sh/kairos-${{ inputs.flavor }}-${{ inputs.flavor_release }}-${{ github.sha }}:24h \
             --TEST_SUITE=upgrade-latest-with-cli