Fix even more things

Signed-off-by: Dimitris Karakasilis <[email protected]>
kairos-io · Oct 12, 2023 · 5c76045 · 5c76045
1 parent 517fe3f
commit 5c76045
Show file tree

Hide file tree

Showing 11 changed files with 43 additions and 11 deletions.
diff --git a/.github/workflows/image-pr.yaml b/.github/workflows/image-pr.yaml
@@ -63,7 +63,6 @@ jobs:
     uses: ./.github/workflows/reusable-qemu-netboot-test.yaml
     with:
       flavor: ubuntu
-      flavor_release: "23.04"
     needs:
       - core
 

diff --git a/.github/workflows/reusable-build-flavor.yaml b/.github/workflows/reusable-build-flavor.yaml
@@ -6,15 +6,21 @@ on:
       flavor:
         required: true
         type: string
-      family:
+      flavor_release:
         required: true
         type: string
-      artifact:
+      family:
         required: true
         type: string
       base_image:
         required: true
         type: string
+      model:
+        required: true
+        type: string
+      variant:
+        required: true
+        type: string
 
 jobs:
   build:

diff --git a/.github/workflows/reusable-encryption-test.yaml b/.github/workflows/reusable-encryption-test.yaml
@@ -6,6 +6,9 @@ on:
       flavor:
         required: true
         type: string
+      flavor_release:
+        required: true
+        type: string
       label:
         required: true
         type: string
@@ -74,7 +77,7 @@ jobs:
         id: iso
         uses: actions/download-artifact@v3
         with:
-          name: kairos-${{ inputs.flavor }}.iso.zip
+          name: kairos-${{ inputs.flavor }}-${{ inputs.flavor_release }}.iso.zip
       - name: Display structure of downloaded files
         run: ls -las .
       - name: Block all traffic to metadata ip  # For cloud runners, the metadata ip can interact with our test machines

diff --git a/.github/workflows/reusable-install-test.yaml b/.github/workflows/reusable-install-test.yaml
@@ -6,6 +6,9 @@ on:
       flavor:
         required: true
         type: string
+      flavor_release:
+        required: true
+        type: string
 
 jobs:
   test:
@@ -18,7 +21,7 @@ jobs:
         id: iso
         uses: actions/download-artifact@v3
         with:
-          name: kairos-${{ inputs.flavor }}.iso.zip
+          name: kairos-${{ inputs.flavor }}-${{ inputs.flavor_release}}.iso.zip
       - name: Display structure of downloaded files
         run: ls -las .
       - name: Install deps

diff --git a/.github/workflows/reusable-qemu-acceptance-test.yaml b/.github/workflows/reusable-qemu-acceptance-test.yaml
@@ -6,6 +6,9 @@ on:
       flavor:
         required: true
         type: string
+      flavor_release:
+        required: true
+        type: string
       port:
         required: false
         type: string
@@ -53,7 +56,7 @@ jobs:
       id: iso
       uses: actions/download-artifact@v3
       with:
-        name: kairos-${{ inputs.flavor }}.iso.zip
+        name: kairos-${{ inputs.flavor }}-${{ inputs.flavor_release }}.iso.zip
     - name: Display structure of downloaded files
       run: ls -las .
     - name: Install earthly
@@ -66,4 +69,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 core-*${{ inputs.flavor }}*.iso) --FLAVOR=${{ inputs.flavor }} --SSH_PORT=${{ inputs.port }}
+            earthly +run-qemu-datasource-tests --PREBUILT_ISO=$(ls *${{ 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
@@ -6,6 +6,9 @@ on:
       flavor:
         required: true
         type: string
+      flavor_release:
+        required: true
+        type: string
 
 jobs:
   test:
@@ -18,7 +21,7 @@ jobs:
         id: iso
         uses: actions/download-artifact@v3
         with:
-          name: kairos-${{ inputs.flavor }}.iso.zip
+          name: kairos-${{ inputs.flavor }}-${{ inputs.flavor_release }}.iso.zip
       - name: Display structure of downloaded files
         run: ls -las .
       - name: Install earthly

diff --git a/.github/workflows/reusable-qemu-netboot-test.yaml b/.github/workflows/reusable-qemu-netboot-test.yaml
@@ -6,6 +6,9 @@ on:
       flavor:
         required: true
         type: string
+      flavor_release:
+        required: true
+        type: string
 
 jobs:
   test:

diff --git a/.github/workflows/reusable-qemu-reset-test.yaml b/.github/workflows/reusable-qemu-reset-test.yaml
@@ -6,6 +6,9 @@ on:
       flavor:
         required: true
         type: string
+      flavor_release:
+        required: true
+        type: string
 
 jobs:
   test:
@@ -18,7 +21,7 @@ jobs:
         id: iso
         uses: actions/download-artifact@v3
         with:
-          name: kairos-${{ inputs.flavor }}.iso.zip
+          name: kairos-${{ inputs.flavor }}-${{ inputs.flavor_release }}.iso.zip
       - name: Display structure of downloaded files
         run: ls -las .
       - name: Install earthly

diff --git a/.github/workflows/reusable-upgrade-latest-test.yaml b/.github/workflows/reusable-upgrade-latest-test.yaml
@@ -6,6 +6,9 @@ on:
       flavor:
         required: true
         type: string
+      flavor_release:
+        required: true
+        type: string
 
 jobs:
   test:

diff --git a/.github/workflows/reusable-upgrade-with-cli-test.yaml b/.github/workflows/reusable-upgrade-with-cli-test.yaml
@@ -6,6 +6,9 @@ on:
       flavor:
         required: true
         type: string
+      flavor_release:
+        required: true
+        type: string
 
 jobs:
   test:
@@ -55,7 +58,7 @@ jobs:
         id: iso
         uses: actions/download-artifact@v3
         with:
-          name: kairos-${{ inputs.flavor }}.iso.zip
+          name: kairos-${{ inputs.flavor }}-${{ inputs.flavor_release }}.iso.zip
       - name: Display structure of downloaded files
         run: ls -las .
       - name: Block all traffic to metadata ip  # For cloud runners, the metadata ip can interact with our test machines

diff --git a/.github/workflows/reusable-zfs-test.yaml b/.github/workflows/reusable-zfs-test.yaml
@@ -6,6 +6,9 @@ on:
       flavor:
         required: true
         type: string
+      flavor_release:
+        required: true
+        type: string
 
 jobs:
   test:
@@ -16,7 +19,7 @@ jobs:
         id: iso
         uses: actions/download-artifact@v3
         with:
-          name: kairos-${{ inputs.flavor }}.iso.zip
+          name: kairos-${{ inputs.flavor }}-${{ inputs.flavor_release }}.iso.zip
       - name: Display structure of downloaded files
         run: ls -R
       - name: Install earthly
-Original file line number
+Diff line change
@@ Expand Up / @@ -63,7 +63,6 @@ jobs: @@
         uses: ./.github/workflows/reusable-qemu-netboot-test.yaml
         with:
           flavor: ubuntu
-          flavor_release: "23.04"
         needs:
           - core
@@ Expand Down @@