diff --git a/.github/workflows/reusable-upgrade-latest-test.yaml b/.github/workflows/reusable-upgrade-latest-test.yaml index 9727a05046..1668206960 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-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 \ --TEST_SUITE=upgrade-latest-with-cli 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 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