From 80d12a5fa376b8d88b92a7255da12bcb2048c621 Mon Sep 17 00:00:00 2001 From: Dimitris Karakasilis Date: Thu, 14 Sep 2023 16:54:32 +0300 Subject: [PATCH 1/5] Pick the right artifact from releases because the artifact names have changed in the last release and the globbing of release-dowloader is not that smart Signed-off-by: Dimitris Karakasilis --- .github/workflows/reusable-upgrade-latest-test.yaml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/.github/workflows/reusable-upgrade-latest-test.yaml b/.github/workflows/reusable-upgrade-latest-test.yaml index 9727a05046..531d5def87 100644 --- a/.github/workflows/reusable-upgrade-latest-test.yaml +++ b/.github/workflows/reusable-upgrade-latest-test.yaml @@ -51,7 +51,7 @@ jobs: # A flag to set the download target as latest release # The default value is 'false' latest: true - fileName: 'kairos-${{ inputs.flavor }}-v*.iso' + fileName: 'kairos-core-${{ inputs.flavor }}-amd64-generic-v*.iso' out-file-path: "" - name: Display structure of downloaded files run: ls -las . @@ -65,7 +65,10 @@ 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-${{ inputs.flavor }}*.iso) \ + # release-downloader globing matches more than one iso. Make sure + # we use the right one. + ISO=$(ls kairos-${{ inputs.flavor }}*.iso | grep -v ipxe) + earthly +run-qemu-test --PREBUILT_ISO=$ISO \ --FLAVOR=${{ inputs.flavor }} \ --CONTAINER_IMAGE=ttl.sh/kairos-${{ inputs.flavor }}-${{ github.sha }}:24h \ --TEST_SUITE=upgrade-latest-with-cli From f911bc5332ebef77972f3c84b79cfc99e229482a Mon Sep 17 00:00:00 2001 From: Dimitris Karakasilis Date: Thu, 14 Sep 2023 17:55:56 +0300 Subject: [PATCH 2/5] One more CI fix :( Signed-off-by: Dimitris Karakasilis --- .github/workflows/reusable-upgrade-latest-test.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/reusable-upgrade-latest-test.yaml b/.github/workflows/reusable-upgrade-latest-test.yaml index 531d5def87..1668206960 100644 --- a/.github/workflows/reusable-upgrade-latest-test.yaml +++ b/.github/workflows/reusable-upgrade-latest-test.yaml @@ -67,7 +67,7 @@ jobs: - run: | # release-downloader globing matches more than one iso. Make sure # we use the right one. - ISO=$(ls kairos-${{ inputs.flavor }}*.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 }}-${{ github.sha }}:24h \ From 13720665c3a20ae08c3d3b9b814334fe3e51b33e Mon Sep 17 00:00:00 2001 From: Itxaka Date: Fri, 15 Sep 2023 09:31:21 +0200 Subject: [PATCH 3/5] :bug: Provide a generic bootargs in the framework for fips (#1818) --- Earthfile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Earthfile b/Earthfile index 1ae5e93ed5..69df0793ee 100644 --- a/Earthfile +++ b/Earthfile @@ -288,6 +288,9 @@ framework: ELSE IF [[ "$FLAVOR" =~ -rpi$ ]] COPY ./images/rpi/bootargs.cfg /framework/etc/cos/bootargs.cfg COPY ./images/rpi/config.txt /framework/boot/config.txt + ELSE IF [[ "$FLAVOR" =~ ^fips-systemd* ]] + # Use a generic one like redhat which has selinux disabled so it can be used on all flavors?? + COPY ./images/redhat/bootargs.cfg /framework/etc/cos/bootargs.cfg END END From ce6f02f3fb074e98936bfbc16d852aa6810d986a Mon Sep 17 00:00:00 2001 From: "ci-robbot [bot]" <105103991+ci-robbot@users.noreply.github.com> Date: Fri, 15 Sep 2023 11:41:08 +0200 Subject: [PATCH 4/5] :arrow_up: Update repositories (#1822) Signed-off-by: GitHub Co-authored-by: jimmykarily --- framework-profile.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/framework-profile.yaml b/framework-profile.yaml index f2ee740be3..f8b55b9363 100755 --- a/framework-profile.yaml +++ b/framework-profile.yaml @@ -174,9 +174,9 @@ repositories: priority: 2 urls: - "quay.io/kairos/packages" - reference: 20230913100915-repository.yaml + reference: 20230915091405-repository.yaml - !!merge <<: *kairos arch: arm64 urls: - "quay.io/kairos/packages-arm64" - reference: 20230913100853-repository.yaml + reference: 20230915092049-repository.yaml From a004f0e978278653a5f21c6bb66f8d46b305c349 Mon Sep 17 00:00:00 2001 From: "ci-robbot [bot]" <105103991+ci-robbot@users.noreply.github.com> Date: Mon, 18 Sep 2023 10:15:47 +0200 Subject: [PATCH 5/5] :arrow_up: Update repositories (#1825) Co-authored-by: mudler --- framework-profile.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/framework-profile.yaml b/framework-profile.yaml index f8b55b9363..470c50f41c 100755 --- a/framework-profile.yaml +++ b/framework-profile.yaml @@ -174,9 +174,9 @@ repositories: priority: 2 urls: - "quay.io/kairos/packages" - reference: 20230915091405-repository.yaml + reference: 20230915145241-repository.yaml - !!merge <<: *kairos arch: arm64 urls: - "quay.io/kairos/packages-arm64" - reference: 20230915092049-repository.yaml + reference: 20230915154712-repository.yaml