Fix artifact names in CI

Signed-off-by: Dimitris Karakasilis <[email protected]>
kairos-io · Oct 12, 2023 · 996da29 · 996da29
1 parent 2d6679f
commit 996da29
Show file tree

Hide file tree

Showing 9 changed files with 24 additions and 8 deletions.
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
@@ -64,6 +64,8 @@ jobs:
         fetch-depth: 0
     - id: set-matrix
       run: |
+          # TODO: Decide what framework images we need to build
+          # https://github.com/kairos-io/kairos/issues/1896
           content=`cat .github/flavors.json`
           # the following lines are only required for multi line json
           content="${content//'%'/'%25'}"
@@ -183,8 +185,21 @@ jobs:
       - name: Build  🔧
         env:
           FLAVOR: ${{ matrix.flavor }}
+          FAMILY: ${{ matrix.family }}
+          ARTIFACT: ${{ matrix.artifact }}
+          VARIANT:  ${{ matrix.variant }}
+          MODEL: ${{ matrix.model }}
+          BASE_IMAGE: ${{ matrix.base_image }}
+        # TODO: Create a reusable script/workflow/something that generates the artifact name
         run: |
-          earthly +all --VARIANT=core --FLAVOR=$FLAVOR
+          earthly +all  \
+            --VARIANT=${{ matrix.variant }} \
+            --FAMILY=${{ matrix.family }} \
+            --FLAVOR=${{ matrix.flavor }} \
+            --MODEL=${{ matrix.model }} \
+            --BASE_IMAGE=${{ matrix.base_image }} \
+            --IMAGE=quay.io/kairos/${{ matrix.variant }}-${{ inputs.flavor }}-${{ matrix.model }}:latest
+
           sudo mv build release
       - name: Push to quay
         env:

diff --git a/.github/workflows/reusable-encryption-test.yaml b/.github/workflows/reusable-encryption-test.yaml
@@ -87,5 +87,5 @@ jobs:
           EMULATE_TPM: true
           USE_QEMU: true
         run: |
-          export ISO=$(ls $PWD/kairos-core-*${{ inputs.flavor }}*.iso)
+          export ISO=$(ls $PWD/core-*${{ inputs.flavor }}*.iso)
           .github/encryption-tests.sh
diff --git a/.github/workflows/reusable-install-test.yaml b/.github/workflows/reusable-install-test.yaml
@@ -31,7 +31,7 @@ jobs:
           cache-dependency-path: tests/go.sum
       - name: Ginkgo
         run: |
-          export ISO=$(ls $PWD/kairos-core-*${{ inputs.flavor }}*.iso)
+          export ISO=$(ls $PWD/core-*${{ inputs.flavor }}*.iso)
           export GOPATH="/Users/runner/go"
           export PATH=$PATH:$GOPATH/bin
           export CREATE_VM=true

diff --git a/.github/workflows/reusable-qemu-acceptance-test.yaml b/.github/workflows/reusable-qemu-acceptance-test.yaml
@@ -66,4 +66,4 @@ jobs:
         sudo iptables -I INPUT -s 169.254.169.254 -j DROP
         sudo iptables -I OUTPUT -d 169.254.169.254 -j DROP
     - run: |
-            earthly +run-qemu-datasource-tests --PREBUILT_ISO=$(ls kairos-core-*${{ inputs.flavor }}*.iso) --FLAVOR=${{ inputs.flavor }} --SSH_PORT=${{ inputs.port }}
+            earthly +run-qemu-datasource-tests --PREBUILT_ISO=$(ls core-*${{ inputs.flavor }}*.iso) --FLAVOR=${{ inputs.flavor }} --SSH_PORT=${{ inputs.port }}
diff --git a/.github/workflows/reusable-qemu-bundles-test.yaml b/.github/workflows/reusable-qemu-bundles-test.yaml
@@ -47,4 +47,4 @@ jobs:
           EOF
 
           earthly -P +prepare-bundles-tests
-          earthly -P +run-qemu-bundles-tests --PREBUILT_ISO=$(ls kairos-core-*${{ inputs.flavor }}*.iso) --FLAVOR=${{ inputs.flavor }}
+          earthly -P +run-qemu-bundles-tests --PREBUILT_ISO=$(ls core-*${{ inputs.flavor }}*.iso) --FLAVOR=${{ inputs.flavor }}
diff --git a/.github/workflows/reusable-qemu-reset-test.yaml b/.github/workflows/reusable-qemu-reset-test.yaml
@@ -45,4 +45,4 @@ jobs:
                   insecure = true
                   http = true
             EOF
-            earthly -P +run-qemu-datasource-tests --PREBUILT_ISO=$(ls kairos-core-*${{ inputs.flavor }}*.iso) --TEST_SUITE=reset-test --FLAVOR=${{ inputs.flavor }}
+            earthly -P +run-qemu-datasource-tests --PREBUILT_ISO=$(ls core-*${{ inputs.flavor }}*.iso) --TEST_SUITE=reset-test --FLAVOR=${{ inputs.flavor }}
diff --git a/.github/workflows/reusable-upgrade-latest-test.yaml b/.github/workflows/reusable-upgrade-latest-test.yaml
@@ -51,6 +51,7 @@ jobs:
           # A flag to set the download target as latest release
           # The default value is 'false'
           latest: true
+          # TODO: Until we publish with the new names, what should this be?
           fileName: 'kairos-core-${{ inputs.flavor }}-amd64-generic-v*.iso'
           out-file-path: ""
       - name: Display structure of downloaded files

diff --git a/.github/workflows/reusable-upgrade-with-cli-test.yaml b/.github/workflows/reusable-upgrade-with-cli-test.yaml
@@ -63,7 +63,7 @@ jobs:
           sudo iptables -I INPUT -s 169.254.169.254 -j DROP
           sudo iptables -I OUTPUT -d 169.254.169.254 -j DROP
       - run: |
-          earthly +run-qemu-test --PREBUILT_ISO=$(ls kairos-core-*${{ inputs.flavor }}*.iso) \
+          earthly +run-qemu-test --PREBUILT_ISO=$(ls core-*${{ inputs.flavor }}*.iso) \
             --FLAVOR=${{ inputs.flavor }} \
             --CONTAINER_IMAGE=ttl.sh/kairos-${{ inputs.flavor }}-${{ github.sha }}:24h \
             --TEST_SUITE=upgrade-with-cli

diff --git a/.github/workflows/reusable-zfs-test.yaml b/.github/workflows/reusable-zfs-test.yaml
@@ -29,4 +29,4 @@ jobs:
           sudo iptables -I INPUT -s 169.254.169.254 -j DROP
           sudo iptables -I OUTPUT -d 169.254.169.254 -j DROP
       - run: |
-          earthly +run-qemu-test --PREBUILT_ISO=$(ls kairos-core-*${{ inputs.flavor }}*.iso) --TEST_SUITE=zfs --FLAVOR=${{ inputs.flavor }}
+          earthly +run-qemu-test --PREBUILT_ISO=$(ls core-*${{ inputs.flavor }}*.iso) --TEST_SUITE=zfs --FLAVOR=${{ inputs.flavor }}