🤖 Fix security scans missing from master build (#1948)

kairos-io · Oct 24, 2023 · 38c9bf9 · 38c9bf9
1 parent 664c96f
commit 38c9bf9
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 11 deletions.
diff --git a/.github/workflows/image.yaml b/.github/workflows/image.yaml
@@ -267,16 +267,16 @@ jobs:
       matrix:
         include:
           - flavor: "opensuse"
-            flavorRelease: "leap/15.5"
+            flavorRelease: "leap-15.5"
             label: "provider-qrcode-install"
           - flavor: "opensuse"
-            flavorRelease: "leap/15.5"
+            flavorRelease: "leap-15.5"
             label: "provider-upgrade"
           - flavor: "opensuse"
-            flavorRelease: "leap/15.5"
+            flavorRelease: "leap-15.5"
             label: "provider-decentralized-k8s"
           - flavor: "opensuse"
-            flavorRelease: "leap/15.5"
+            flavorRelease: "leap-15.5"
             label: "provider-upgrade-k8s"
           - flavor: "alpine"
             flavorRelease: "3.18"

diff --git a/.github/workflows/reusable-build-flavor.yaml b/.github/workflows/reusable-build-flavor.yaml
@@ -113,7 +113,7 @@ jobs:
         if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/master' }}
         run: |
           earthly --platform=linux/${{ inputs.arch }} +ci \
-            --SECURITY_SCANS=false \
+            --SECURITY_SCANS=true \
             --VARIANT=${{ inputs.variant }} \
             --FLAVOR=${{ inputs.flavor }} \
             --FLAVOR_RELEASE=${{ inputs.flavor_release }} \

diff --git a/.github/workflows/reusable-provider-upgrade-latest-test.yaml b/.github/workflows/reusable-provider-upgrade-latest-test.yaml
@@ -53,7 +53,8 @@ jobs:
         with:
           latest: true
           repository: "kairos-io/kairos"
-          fileName: 'kairos-standard-*${{ inputs.flavor }}-${{ inputs.flavor_release }}.*k3s1.iso'
+          #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'
           out-file-path: ""
       - name: Run tests
         run: |
@@ -64,8 +65,6 @@ jobs:
           export DRIVE_SIZE=30000
           export CONTAINER_IMAGE=ttl.sh/kairos-${{ inputs.flavor }}-${{ inputs.flavor_release }}-${{ github.sha }}-provider:24h
 
-          K3S_VERSION=$(sudo luet --config framework-profile.yaml search -o json k8s/k3s  | jq -r '.packages | map(.version) | unique | last' | cut -d+ -f1)
-
-          export ISO=$PWD/$(ls *${K3S_VERSION}*.iso | head -n 1)
+          export ISO=$PWD/$(ls -l *.iso | head -n 1)
           cp tests/go.* .
           go run github.com/onsi/ginkgo/v2/ginkgo -v --label-filter "provider-upgrade-latest-k8s-with-kubernetes" --fail-fast -r ./tests
diff --git a/framework-profile.yaml b/framework-profile.yaml
@@ -48,9 +48,9 @@ repositories:
     priority: 2
     urls:
       - "quay.io/kairos/packages"
-    reference: 20231023123951-repository.yaml
+    reference: 20231024170030-repository.yaml
   - !!merge <<: *kairos
     arch: arm64
     urls:
       - "quay.io/kairos/packages-arm64"
-    reference: 20231023073447-repository.yaml
+    reference: 20231024170147-repository.yaml