From d433aa86da4cb75bf96597a2249c18e9e8966390 Mon Sep 17 00:00:00 2001 From: Mario Cattamo Date: Fri, 20 Sep 2024 14:40:13 +0200 Subject: [PATCH] ci: add fedora 42 (Rawhide) support --- .github/workflows/fedora-41.yml | 98 ++++++++++++++++++++++++ .github/workflows/trigger-fedora.yml | 110 ++++++++++++++------------- arm-commit.sh | 24 +++--- files/fedora-41.json | 4 +- files/fedora-42.json | 18 +++++ ostree-ng.sh | 12 +-- ostree-raw-image.sh | 12 +-- ostree.sh | 16 ++-- setup.sh | 14 +--- tools/playbook/group_vars/all | 3 + 10 files changed, 212 insertions(+), 99 deletions(-) create mode 100644 .github/workflows/fedora-41.yml create mode 100644 files/fedora-42.json diff --git a/.github/workflows/fedora-41.yml b/.github/workflows/fedora-41.yml new file mode 100644 index 000000000..548207a3b --- /dev/null +++ b/.github/workflows/fedora-41.yml @@ -0,0 +1,98 @@ +--- +name: Run Edge Test on Fedora 41 + +on: + issue_comment: + types: + - created + +jobs: + pr-info: + if: ${{ github.event.issue.pull_request && + (endsWith(github.event.comment.body, '/test-f41')) }} + runs-on: ubuntu-latest + steps: + - name: Query author repository permissions + uses: octokit/request-action@v2.x + id: user_permission + with: + route: GET /repos/${{ github.repository }}/collaborators/${{ github.event.sender.login }}/permission + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + + - name: Check if user does have correct permissions + if: contains('admin write', fromJson(steps.user_permission.outputs.data).permission) + id: check_user_perm + run: | + echo "User '${{ github.event.sender.login }}' has permission '${{ fromJson(steps.user_permission.outputs.data).permission }}' allowed values: 'admin', 'write'" + echo "allowed_user=true" >> $GITHUB_OUTPUT + + - name: Get information for pull request + uses: octokit/request-action@v2.x + id: pr-api + with: + route: GET /repos/${{ github.repository }}/pulls/${{ github.event.issue.number }} + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + + outputs: + allowed_user: ${{ steps.check_user_perm.outputs.allowed_user }} + sha: ${{ fromJson(steps.pr-api.outputs.data).head.sha }} + ref: ${{ fromJson(steps.pr-api.outputs.data).head.ref }} + repo_url: ${{ fromJson(steps.pr-api.outputs.data).head.repo.html_url }} + + iot-f41-x86: + needs: pr-info + if: ${{ needs.pr-info.outputs.allowed_user == 'true' && github.event.issue.pull_request }} + continue-on-error: true + runs-on: ubuntu-latest + + steps: + - name: Clone repository + uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4 + with: + ref: ${{ needs.pr-info.outputs.sha }} + fetch-depth: 0 + + - name: Run the tests + uses: sclorg/testing-farm-as-github-action@v3.1.0 + with: + compose: Fedora-41 + api_key: ${{ secrets.TF_API_KEY }} + git_url: ${{ needs.pr-info.outputs.repo_url }} + git_ref: ${{ needs.pr-info.outputs.ref }} + update_pull_request_status: true + pull_request_status_name: "iot-f41-x86" + tmt_context: "arch=x86_64;distro=fedora" + tmt_plan_regex: edge-x86 + tf_scope: private + secrets: "DOWNLOAD_NODE=${{ secrets.DOWNLOAD_NODE }};QUAY_USERNAME=${{ secrets.QUAY_USERNAME }};QUAY_PASSWORD=${{ secrets.QUAY_PASSWORD }};DOCKERHUB_USERNAME=${{ secrets.DOCKERHUB_USERNAME }};DOCKERHUB_PASSWORD=${{ secrets.DOCKERHUB_PASSWORD }};AWS_ACCESS_KEY_ID=${{ secrets.AWS_ACCESS_KEY_ID }};AWS_SECRET_ACCESS_KEY=${{ secrets.AWS_SECRET_ACCESS_KEY }};GOVC_URL=${{ secrets.GOVC_URL }};GOVC_USERNAME=${{ secrets.GOVC_USERNAME }};GOVC_PASSWORD=${{ secrets.GOVC_PASSWORD }}" + variables: "ARCH=x86_64;AWS_DEFAULT_REGION=us-east-1;GOVC_INSECURE=1" + + iot-f41-arm: + needs: pr-info + if: ${{ needs.pr-info.outputs.allowed_user == 'true' && github.event.issue.pull_request }} + continue-on-error: true + runs-on: ubuntu-latest + + steps: + - name: Clone repository + uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4 + with: + ref: ${{ needs.pr-info.outputs.sha }} + fetch-depth: 0 + + - name: Run the tests + uses: sclorg/testing-farm-as-github-action@v3.1.0 + with: + compose: Fedora-41 + api_key: ${{ secrets.TF_API_KEY }} + git_url: ${{ needs.pr-info.outputs.repo_url }} + git_ref: ${{ needs.pr-info.outputs.ref }} + update_pull_request_status: true + pull_request_status_name: "iot-f41-arm" + tmt_context: "arch=aarch64;distro=fedora" + tmt_plan_regex: edge-arm + tf_scope: private + secrets: "DOWNLOAD_NODE=${{ secrets.DOWNLOAD_NODE }};QUAY_USERNAME=${{ secrets.QUAY_USERNAME }};QUAY_PASSWORD=${{ secrets.QUAY_PASSWORD }};DOCKERHUB_USERNAME=${{ secrets.DOCKERHUB_USERNAME }};DOCKERHUB_PASSWORD=${{ secrets.DOCKERHUB_PASSWORD }};AWS_ACCESS_KEY_ID=${{ secrets.AWS_ACCESS_KEY_ID }};AWS_SECRET_ACCESS_KEY=${{ secrets.AWS_SECRET_ACCESS_KEY }};GOVC_URL=${{ secrets.GOVC_URL }};GOVC_USERNAME=${{ secrets.GOVC_USERNAME }};GOVC_PASSWORD=${{ secrets.GOVC_PASSWORD }}" + variables: "ARCH=aarch64;AWS_DEFAULT_REGION=us-east-1;GOVC_INSECURE=1" diff --git a/.github/workflows/trigger-fedora.yml b/.github/workflows/trigger-fedora.yml index 151fcb571..96582ee4e 100644 --- a/.github/workflows/trigger-fedora.yml +++ b/.github/workflows/trigger-fedora.yml @@ -9,10 +9,12 @@ on: env: COMPOSE_URL_rawhide: https://dl.fedoraproject.org/pub/fedora/linux/development/rawhide + COMPOSE_URL_F41: https://dl.fedoraproject.org/pub/fedora/linux/development/41 + UPDATES_URL_F41: https://dl.fedoraproject.org/pub/fedora/linux/development/41 COMPOSE_URL_F40: https://dl.fedoraproject.org/pub/fedora/linux/releases/40 - UPDATES_URL_F40: https://dl.fedoraproject.org/pub/fedora/linux/releases/40 - COMPOSE_URL_F39: https://dl.fedoraproject.org/pub/fedora/linux/releases/39 - UPDATES_URL_F39: https://dl.fedoraproject.org/pub/fedora/linux/updates/39 + UPDATES_URL_F40: https://dl.fedoraproject.org/pub/fedora/linux/updates/40 + # COMPOSE_URL_F39: https://dl.fedoraproject.org/pub/fedora/linux/releases/39 + # UPDATES_URL_F39: https://dl.fedoraproject.org/pub/fedora/linux/updates/39 jobs: @@ -128,7 +130,7 @@ jobs: column-name: Fedora-rawhide issue-number: ${{ steps.cpr.outputs.pull-request-number }} - fedora-40: + fedora-41: # Do not need check-compose and make "workflow_dispatch" work for this job if: github.repository == 'virt-s1/rhel-edge' && github.event.schedule != '0 4 * * *' runs-on: ubuntu-latest @@ -138,23 +140,23 @@ jobs: - name: Get package version id: package_version run: | - curl -s "${COMPOSE_URL_F40}/COMPOSE_ID" --output COMPOSE_ID_F40 - COMPOSE_ID_F40=$(cat COMPOSE_ID_F40) + curl -s "${COMPOSE_URL_F41}/COMPOSE_ID" --output COMPOSE_ID_F41 + COMPOSE_ID_F41=$(cat COMPOSE_ID_F41) - OSBUILD_VERSION_F40=$(curl -s "${UPDATES_URL_F40}/Everything/x86_64/os/Packages/o/" | grep -ioE ">osbuild-[0-9].*<" | tr -d "><") - OSBUILD_COMPOSER_VERSION_F40=$(curl -s "${UPDATES_URL_F40}/Everything/os/x86_64/Packages/o/" | grep -ioE ">osbuild-composer-[0-9].*<" | tr -d "><") - COMPOSER_CLI_VERSION_F40=$(curl -s "${COMPOSE_URL_F40}/Everything/x86_64/os/Packages/w/" | grep -ioE ">weldr-client-[0-9].*<" | tr -d "><") - echo "osbuild_version_f40=$OSBUILD_VERSION_F40" >> $GITHUB_OUTPUT - echo "osbuild_composer_version_f40=$OSBUILD_COMPOSER_VERSION_F40" >> $GITHUB_OUTPUT - echo "composer_cli_version_f40=$COMPOSER_CLI_VERSION_F40" >> $GITHUB_OUTPUT + OSBUILD_VERSION_F41=$(curl -s "${UPDATES_URL_F41}/Everything/x86_64/os/Packages/o/" | grep -ioE ">osbuild-[0-9].*<" | tr -d "><") + OSBUILD_COMPOSER_VERSION_F41=$(curl -s "${UPDATES_URL_F41}/Everything/x86_64/os/Packages/o/" | grep -ioE ">osbuild-composer-[0-9].*<" | tr -d "><") + COMPOSER_CLI_VERSION_F41=$(curl -s "${COMPOSE_URL_F41}/Everything/x86_64/os/Packages/w/" | grep -ioE ">weldr-client-[0-9].*<" | tr -d "><") + echo "osbuild_version_f41=$OSBUILD_VERSION_F41" >> $GITHUB_OUTPUT + echo "osbuild_composer_version_f41=$OSBUILD_COMPOSER_VERSION_F41" >> $GITHUB_OUTPUT + echo "composer_cli_version_f41=$COMPOSER_CLI_VERSION_F41" >> $GITHUB_OUTPUT - echo "f40_compose=$COMPOSE_ID_F40" >> $GITHUB_OUTPUT + echo "f41_compose=$COMPOSE_ID_F41" >> $GITHUB_OUTPUT - - name: Add new compose id in compose.f40 + - name: Add new compose id in compose.f41 run: | - compose_id="${{ steps.package_version.outputs.f40_compose }}" - echo $compose_id >> compose/compose.f40 - cat compose/compose.f40 + compose_id="${{ steps.package_version.outputs.f41_compose }}" + echo $compose_id >> compose/compose.f41 + cat compose/compose.f41 - name: Get current date id: date @@ -165,42 +167,42 @@ jobs: uses: peter-evans/create-pull-request@v4 with: token: ${{ secrets.GITHUB_TOKEN }} - commit-message: "Fedora 40 Daily Compose Test - ${{ steps.date.outputs.date }}" + commit-message: "Fedora 41 Daily Compose Test - ${{ steps.date.outputs.date }}" committer: cloudkitebot author: ${{ github.actor }} <${{ github.actor }}@users.noreply.github.com> branch: cpr branch-suffix: random delete-branch: true - title: " Fedora 40 Daily Compose Test- ${{ steps.date.outputs.date }}" - labels: DO_NOT_MERGE,fedora-40 + title: " Fedora 41 Daily Compose Test- ${{ steps.date.outputs.date }}" + labels: DO_NOT_MERGE,fedora-41 body: | - Fedora 40 compose ${{ steps.package_version.outputs.f40_compose }} + Fedora 41 compose ${{ steps.package_version.outputs.f41_compose }} - Date: ${{ steps.date.outputs.date }} - - Compose URL: ${{ env.COMPOSE_URL_F40 }} - - Updates URL: ${{ env.UPDATES_URL_F40 }} + - Compose URL: ${{ env.COMPOSE_URL_F41 }} + - Updates URL: ${{ env.UPDATES_URL_F41 }} - Packages: - - ${{ steps.package_version.outputs.osbuild_version_f40 }} - - ${{ steps.package_version.outputs.osbuild_composer_version_f40 }} - - ${{ steps.package_version.outputs.composer_cli_version_f40 }} + - ${{ steps.package_version.outputs.osbuild_version_f41 }} + - ${{ steps.package_version.outputs.osbuild_composer_version_f41 }} + - ${{ steps.package_version.outputs.composer_cli_version_f41 }} - name: Add a comment to trigger test workflow uses: peter-evans/create-or-update-comment@v2 with: token: ${{ secrets.PAT }} issue-number: ${{ steps.cpr.outputs.pull-request-number }} - body: /test-f40 + body: /test-f41 - name: Create a project card to track compose test result uses: peter-evans/create-or-update-project-card@v2 with: token: ${{ secrets.GITHUB_TOKEN }} project-name: Fedora Compose Test - column-name: Fedora-40 + column-name: Fedora-41 issue-number: ${{ steps.cpr.outputs.pull-request-number }} - fedora-39: + fedora-40: # Do not need check-compose and make "workflow_dispatch" work for this job - if: github.repository == 'virt-s1/rhel-edge' && github.event.schedule != '0 16 * * *' + if: github.repository == 'virt-s1/rhel-edge' && github.event.schedule != '0 4 * * *' runs-on: ubuntu-latest steps: - uses: actions/checkout@v3 @@ -208,23 +210,23 @@ jobs: - name: Get package version id: package_version run: | - curl -s "${COMPOSE_URL_F39}/COMPOSE_ID" --output COMPOSE_ID_F39 - COMPOSE_ID_F39=$(cat COMPOSE_ID_F39) + curl -s "${COMPOSE_URL_F40}/COMPOSE_ID" --output COMPOSE_ID_F40 + COMPOSE_ID_F40=$(cat COMPOSE_ID_F40) - OSBUILD_VERSION_F39=$(curl -s "${UPDATES_URL_F39}/Everything/x86_64/Packages/o/" | grep -ioE ">osbuild-[0-9].*<" | tr -d "><") - OSBUILD_COMPOSER_VERSION_F39=$(curl -s "${UPDATES_URL_F39}/Everything/x86_64/Packages/o/" | grep -ioE ">osbuild-composer-[0-9].*<" | tr -d "><") - COMPOSER_CLI_VERSION_F39=$(curl -s "${COMPOSE_URL_F39}/Everything/x86_64/os/Packages/w/" | grep -ioE ">weldr-client-[0-9].*<" | tr -d "><") - echo "osbuild_version_f39=$OSBUILD_VERSION_F39" >> $GITHUB_OUTPUT - echo "osbuild_composer_version_f39=$OSBUILD_COMPOSER_VERSION_F39" >> $GITHUB_OUTPUT - echo "composer_cli_version_f39=$COMPOSER_CLI_VERSION_F39" >> $GITHUB_OUTPUT + OSBUILD_VERSION_F40=$(curl -s "${UPDATES_URL_F40}/Everything/x86_64/Packages/o/" | grep -ioE ">osbuild-[0-9].*<" | tr -d "><") + OSBUILD_COMPOSER_VERSION_F40=$(curl -s "${UPDATES_URL_F40}/Everything/x86_64/Packages/o/" | grep -ioE ">osbuild-composer-[0-9].*<" | tr -d "><") + COMPOSER_CLI_VERSION_F40=$(curl -s "${COMPOSE_URL_F40}/Everything/x86_64/os/Packages/w/" | grep -ioE ">weldr-client-[0-9].*<" | tr -d "><") + echo "osbuild_version_f40=$OSBUILD_VERSION_F40" >> $GITHUB_OUTPUT + echo "osbuild_composer_version_f40=$OSBUILD_COMPOSER_VERSION_F40" >> $GITHUB_OUTPUT + echo "composer_cli_version_f40=$COMPOSER_CLI_VERSION_F40" >> $GITHUB_OUTPUT - echo "f39_compose=$COMPOSE_ID_F39" >> $GITHUB_OUTPUT + echo "f40_compose=$COMPOSE_ID_F40" >> $GITHUB_OUTPUT - - name: Add new compose id in compose.f39 + - name: Add new compose id in compose.f40 run: | - compose_id="${{ steps.package_version.outputs.f39_compose }}" - echo $compose_id >> compose/compose.f39 - cat compose/compose.f39 + compose_id="${{ steps.package_version.outputs.f40_compose }}" + echo $compose_id >> compose/compose.f40 + cat compose/compose.f40 - name: Get current date id: date @@ -235,35 +237,35 @@ jobs: uses: peter-evans/create-pull-request@v4 with: token: ${{ secrets.GITHUB_TOKEN }} - commit-message: "Fedora 39 Daily Compose Test - ${{ steps.date.outputs.date }}" + commit-message: "Fedora 40 Daily Compose Test - ${{ steps.date.outputs.date }}" committer: cloudkitebot author: ${{ github.actor }} <${{ github.actor }}@users.noreply.github.com> branch: cpr branch-suffix: random delete-branch: true - title: " Fedora 39 Daily Compose Test- ${{ steps.date.outputs.date }}" - labels: DO_NOT_MERGE,fedora-39 + title: " Fedora 40 Daily Compose Test- ${{ steps.date.outputs.date }}" + labels: DO_NOT_MERGE,fedora-40 body: | - Fedora 39 compose ${{ steps.package_version.outputs.f39_compose }} + Fedora 40 compose ${{ steps.package_version.outputs.f40_compose }} - Date: ${{ steps.date.outputs.date }} - - Compose URL: ${{ env.COMPOSE_URL_F39 }} - - Updates URL: ${{ env.UPDATES_URL_F39 }} + - Compose URL: ${{ env.COMPOSE_URL_F40 }} + - Updates URL: ${{ env.UPDATES_URL_F40 }} - Packages: - - ${{ steps.package_version.outputs.osbuild_version_f39 }} - - ${{ steps.package_version.outputs.osbuild_composer_version_f39 }} - - ${{ steps.package_version.outputs.composer_cli_version_f39 }} + - ${{ steps.package_version.outputs.osbuild_version_f40 }} + - ${{ steps.package_version.outputs.osbuild_composer_version_f40 }} + - ${{ steps.package_version.outputs.composer_cli_version_f40 }} - name: Add a comment to trigger test workflow uses: peter-evans/create-or-update-comment@v2 with: token: ${{ secrets.PAT }} issue-number: ${{ steps.cpr.outputs.pull-request-number }} - body: /test-f39 + body: /test-f40 - name: Create a project card to track compose test result uses: peter-evans/create-or-update-project-card@v2 with: token: ${{ secrets.GITHUB_TOKEN }} project-name: Fedora Compose Test - column-name: Fedora-39 + column-name: Fedora-40 issue-number: ${{ steps.cpr.outputs.pull-request-number }} diff --git a/arm-commit.sh b/arm-commit.sh index 1269291d2..a3f71ae25 100755 --- a/arm-commit.sh +++ b/arm-commit.sh @@ -145,18 +145,6 @@ case "$TEST_OS" in SYSROOT_RO="true" FIREWALL_FEATURE="true" ;; - "fedora-39") - IMAGE_TYPE="iot-commit" - cp tools/user-data "$CLOUD_INIT_DIR" - OS_VARIANT="fedora-unknown" - OSTREE_REF="fedora/39/${ARCH}/iot" - GUEST_IMAGE_URL="https://dl.fedoraproject.org/pub/fedora/linux/releases/39/Cloud/aarch64/images" - GUEST_IMAGE_NAME=$(curl -s "${GUEST_IMAGE_URL}/" | grep -ioE ">Fedora-Cloud-Base-39-.*.qcow2<" | tr -d '><') - USER_IN_COMMIT="false" - EMBEDDED_CONTAINER="false" - BOOT_LOCATION="https://dl.fedoraproject.org/pub/fedora/linux/releases/39/Everything/aarch64/os/" - SYSROOT_RO="true" - ;; "fedora-40") IMAGE_TYPE="iot-commit" cp tools/user-data "$CLOUD_INIT_DIR" @@ -174,6 +162,18 @@ case "$TEST_OS" in cp tools/user-data "$CLOUD_INIT_DIR" OS_VARIANT="fedora-rawhide" OSTREE_REF="fedora/41/${ARCH}/iot" + GUEST_IMAGE_URL="https://dl.fedoraproject.org/pub/fedora/linux/development/41/Cloud/aarch64/images" + GUEST_IMAGE_NAME=$(curl -s "${GUEST_IMAGE_URL}/" | grep -ioE ">Fedora-Cloud-Base-Generic\.aarch64.*.qcow2<" | tr -d '><') + USER_IN_COMMIT="false" + EMBEDDED_CONTAINER="false" + BOOT_LOCATION="https://dl.fedoraproject.org/pub/fedora/linux/development/41/Everything/aarch64/os/" + SYSROOT_RO="true" + ;; + "fedora-42") + IMAGE_TYPE="iot-commit" + cp tools/user-data "$CLOUD_INIT_DIR" + OS_VARIANT="fedora-unknown" + OSTREE_REF="fedora/42/${ARCH}/iot" GUEST_IMAGE_URL="https://dl.fedoraproject.org/pub/fedora/linux/development/rawhide/Cloud/aarch64/images" GUEST_IMAGE_NAME=$(curl -s "${GUEST_IMAGE_URL}/" | grep -ioE ">Fedora-Cloud-Base-Generic\.aarch64.*.qcow2<" | tr -d '><') USER_IN_COMMIT="false" diff --git a/files/fedora-41.json b/files/fedora-41.json index 915cdb53a..13b0ab5c7 100644 --- a/files/fedora-41.json +++ b/files/fedora-41.json @@ -2,7 +2,7 @@ "x86_64": [ { "name": "fedora", - "baseurl": "https://dl.fedoraproject.org/pub/fedora/linux/development/rawhide/Everything/x86_64/os/", + "baseurl": "https://dl.fedoraproject.org/pub/fedora/linux/development/41/Everything/x86_64/os/", "gpgkey": "-----BEGIN PGP PUBLIC KEY BLOCK-----\n\nmQINBGPQTCwBEADFUL0EQLzwpKHtlPkacVI156F2LnWp6K69g/6yzllidHI3b7EV\nQgQ9/Kdou6wNuOahNKa6WcEi6grEXexD7pAcu4xdRUp79XxQy5pC7Aq2/Dwf0vRL\n2y0kqof+C7iSzhHsfLoaqKKeh2njAo1KLZXYTHAWAMbXEyO/FJevaHLXe2+yYd7j\nluD58gyXgGDXXJ2lymLqs2jobjWdmGPNZGFl36RP3Dnk0FpbdH78kyIIsc2foYuF\n00rnuumwCtK3V58VOZo6IkaYk2irdyeetmJjVHwLHwJB3EaAwGy9Z2oAH3LxxFfk\nrQb0DH0Nzb3fpEziopOOqSi+6guV4RHUKAkCUMu+Mo5XwFVPUAIfNRTVqoIaEasC\nWO26lhkB87wwIvyb/TPGSeh6laHPRf0QOUOLkugdkSHoaJFWoTCcu9Y4aeDpf+ZQ\nfMVmkJNRS1tXONgz+pDk1rro/tNrkusYG18xjvSZTB0P0C4b4+jgK5l7me0NU6G3\nWw/hIng5lxWfXgE9bpxlN834v1xy5Z3v17guJu1ec/jzKzQQ4356wyegXURjYoWe\nawcnK1S+9gxivnkOk1bGLNxrEh5vB6PDcI1VQ1ECH50EHyvE1IXJDaaStdAkacv2\nqHcd15CnlBW1LYFj0CHs/sGu9FD0iSF95OVRX4gjg9Wa4f8KvtEO/f+FeQARAQAB\ntDFGZWRvcmEgKDQwKSA8ZmVkb3JhLTQwLXByaW1hcnlAZmVkb3JhcHJvamVjdC5v\ncmc+iQJOBBMBCAA4FiEEEV35rvhXhT7oRF0KBydwfqFbecwFAmPQTCwCGw8FCwkI\nBwIGFQoJCAsCBBYCAwECHgECF4AACgkQBydwfqFbecxJOw//XaoJG3zN01bVM63H\nnFmMW/EnLzKrZqH8ZNq8CP9ycoc4q8SYcMprHKG9jufzj5/FhtpYecp3kBMpSYHt\nVu46LS9NajJDwdfvUMezVbieNIQ8icTR5s5IUYFlc47eG6PRe3k0n5fOPcIb6q82\nbyrK3dQnanOcVdoGU7QO9LAAHO9hg0zgZa0MxQAlDQov3dZcr7u7qGcQmU5JzcRS\nJgfDxHxDuMjmq6Kd0/UwD00kd2ptZgRls0ntXdm9CZGtQ/Q0baJ3eRzccpd/8bxy\nRWF9MnOdmV6ojcFKYECjEzcuheUlcKQH9rLkeBSfgrIlK3L7LG8bg5ouZLdx17rQ\nXABNQGmJTaGAiEnS/48G3roMS8R7fhUljcKr6t63QQQJ2qWdPvI6EMC2xKZsLHK4\nXiUvrmJpUprvEQSKBUOf/2zuXDBshtAnoKh7h5aG+TvozL4yNG5DKpSH3MRj1E43\nKoMsP/GN/X5h+vJnvhiCWxNMPP81Op0czBAgukBm627FTnsvieJOOrzyxb1s75+W\n56gJombmhzUfzr88AYY9mFy7diTw/oldDZcfwa8rvOAGJVDlyr2hqkLoGl+5jPex\nslt3NF4caE/wP9wPMgFRkmMOr8eiRhjlWLrO6mQdBp7Qsj3kEXioP+CZ1cv/sbaK\n4DM7VidB4PLrMFQMaf0LpjpC2DM=\n=wOl2\n-----END PGP PUBLIC KEY BLOCK-----\n", "check_gpg": true } @@ -10,7 +10,7 @@ "aarch64": [ { "name": "fedora", - "baseurl": "https://dl.fedoraproject.org/pub/fedora/linux/development/rawhide/Everything/aarch64/os/", + "baseurl": "https://dl.fedoraproject.org/pub/fedora/linux/development/41/Everything/aarch64/os/", "gpgkey": "-----BEGIN PGP PUBLIC KEY BLOCK-----\n\nmQINBGPQTCwBEADFUL0EQLzwpKHtlPkacVI156F2LnWp6K69g/6yzllidHI3b7EV\nQgQ9/Kdou6wNuOahNKa6WcEi6grEXexD7pAcu4xdRUp79XxQy5pC7Aq2/Dwf0vRL\n2y0kqof+C7iSzhHsfLoaqKKeh2njAo1KLZXYTHAWAMbXEyO/FJevaHLXe2+yYd7j\nluD58gyXgGDXXJ2lymLqs2jobjWdmGPNZGFl36RP3Dnk0FpbdH78kyIIsc2foYuF\n00rnuumwCtK3V58VOZo6IkaYk2irdyeetmJjVHwLHwJB3EaAwGy9Z2oAH3LxxFfk\nrQb0DH0Nzb3fpEziopOOqSi+6guV4RHUKAkCUMu+Mo5XwFVPUAIfNRTVqoIaEasC\nWO26lhkB87wwIvyb/TPGSeh6laHPRf0QOUOLkugdkSHoaJFWoTCcu9Y4aeDpf+ZQ\nfMVmkJNRS1tXONgz+pDk1rro/tNrkusYG18xjvSZTB0P0C4b4+jgK5l7me0NU6G3\nWw/hIng5lxWfXgE9bpxlN834v1xy5Z3v17guJu1ec/jzKzQQ4356wyegXURjYoWe\nawcnK1S+9gxivnkOk1bGLNxrEh5vB6PDcI1VQ1ECH50EHyvE1IXJDaaStdAkacv2\nqHcd15CnlBW1LYFj0CHs/sGu9FD0iSF95OVRX4gjg9Wa4f8KvtEO/f+FeQARAQAB\ntDFGZWRvcmEgKDQwKSA8ZmVkb3JhLTQwLXByaW1hcnlAZmVkb3JhcHJvamVjdC5v\ncmc+iQJOBBMBCAA4FiEEEV35rvhXhT7oRF0KBydwfqFbecwFAmPQTCwCGw8FCwkI\nBwIGFQoJCAsCBBYCAwECHgECF4AACgkQBydwfqFbecxJOw//XaoJG3zN01bVM63H\nnFmMW/EnLzKrZqH8ZNq8CP9ycoc4q8SYcMprHKG9jufzj5/FhtpYecp3kBMpSYHt\nVu46LS9NajJDwdfvUMezVbieNIQ8icTR5s5IUYFlc47eG6PRe3k0n5fOPcIb6q82\nbyrK3dQnanOcVdoGU7QO9LAAHO9hg0zgZa0MxQAlDQov3dZcr7u7qGcQmU5JzcRS\nJgfDxHxDuMjmq6Kd0/UwD00kd2ptZgRls0ntXdm9CZGtQ/Q0baJ3eRzccpd/8bxy\nRWF9MnOdmV6ojcFKYECjEzcuheUlcKQH9rLkeBSfgrIlK3L7LG8bg5ouZLdx17rQ\nXABNQGmJTaGAiEnS/48G3roMS8R7fhUljcKr6t63QQQJ2qWdPvI6EMC2xKZsLHK4\nXiUvrmJpUprvEQSKBUOf/2zuXDBshtAnoKh7h5aG+TvozL4yNG5DKpSH3MRj1E43\nKoMsP/GN/X5h+vJnvhiCWxNMPP81Op0czBAgukBm627FTnsvieJOOrzyxb1s75+W\n56gJombmhzUfzr88AYY9mFy7diTw/oldDZcfwa8rvOAGJVDlyr2hqkLoGl+5jPex\nslt3NF4caE/wP9wPMgFRkmMOr8eiRhjlWLrO6mQdBp7Qsj3kEXioP+CZ1cv/sbaK\n4DM7VidB4PLrMFQMaf0LpjpC2DM=\n=wOl2\n-----END PGP PUBLIC KEY BLOCK-----\n", "check_gpg": true } diff --git a/files/fedora-42.json b/files/fedora-42.json new file mode 100644 index 000000000..915cdb53a --- /dev/null +++ b/files/fedora-42.json @@ -0,0 +1,18 @@ +{ + "x86_64": [ + { + "name": "fedora", + "baseurl": "https://dl.fedoraproject.org/pub/fedora/linux/development/rawhide/Everything/x86_64/os/", + "gpgkey": "-----BEGIN PGP PUBLIC KEY BLOCK-----\n\nmQINBGPQTCwBEADFUL0EQLzwpKHtlPkacVI156F2LnWp6K69g/6yzllidHI3b7EV\nQgQ9/Kdou6wNuOahNKa6WcEi6grEXexD7pAcu4xdRUp79XxQy5pC7Aq2/Dwf0vRL\n2y0kqof+C7iSzhHsfLoaqKKeh2njAo1KLZXYTHAWAMbXEyO/FJevaHLXe2+yYd7j\nluD58gyXgGDXXJ2lymLqs2jobjWdmGPNZGFl36RP3Dnk0FpbdH78kyIIsc2foYuF\n00rnuumwCtK3V58VOZo6IkaYk2irdyeetmJjVHwLHwJB3EaAwGy9Z2oAH3LxxFfk\nrQb0DH0Nzb3fpEziopOOqSi+6guV4RHUKAkCUMu+Mo5XwFVPUAIfNRTVqoIaEasC\nWO26lhkB87wwIvyb/TPGSeh6laHPRf0QOUOLkugdkSHoaJFWoTCcu9Y4aeDpf+ZQ\nfMVmkJNRS1tXONgz+pDk1rro/tNrkusYG18xjvSZTB0P0C4b4+jgK5l7me0NU6G3\nWw/hIng5lxWfXgE9bpxlN834v1xy5Z3v17guJu1ec/jzKzQQ4356wyegXURjYoWe\nawcnK1S+9gxivnkOk1bGLNxrEh5vB6PDcI1VQ1ECH50EHyvE1IXJDaaStdAkacv2\nqHcd15CnlBW1LYFj0CHs/sGu9FD0iSF95OVRX4gjg9Wa4f8KvtEO/f+FeQARAQAB\ntDFGZWRvcmEgKDQwKSA8ZmVkb3JhLTQwLXByaW1hcnlAZmVkb3JhcHJvamVjdC5v\ncmc+iQJOBBMBCAA4FiEEEV35rvhXhT7oRF0KBydwfqFbecwFAmPQTCwCGw8FCwkI\nBwIGFQoJCAsCBBYCAwECHgECF4AACgkQBydwfqFbecxJOw//XaoJG3zN01bVM63H\nnFmMW/EnLzKrZqH8ZNq8CP9ycoc4q8SYcMprHKG9jufzj5/FhtpYecp3kBMpSYHt\nVu46LS9NajJDwdfvUMezVbieNIQ8icTR5s5IUYFlc47eG6PRe3k0n5fOPcIb6q82\nbyrK3dQnanOcVdoGU7QO9LAAHO9hg0zgZa0MxQAlDQov3dZcr7u7qGcQmU5JzcRS\nJgfDxHxDuMjmq6Kd0/UwD00kd2ptZgRls0ntXdm9CZGtQ/Q0baJ3eRzccpd/8bxy\nRWF9MnOdmV6ojcFKYECjEzcuheUlcKQH9rLkeBSfgrIlK3L7LG8bg5ouZLdx17rQ\nXABNQGmJTaGAiEnS/48G3roMS8R7fhUljcKr6t63QQQJ2qWdPvI6EMC2xKZsLHK4\nXiUvrmJpUprvEQSKBUOf/2zuXDBshtAnoKh7h5aG+TvozL4yNG5DKpSH3MRj1E43\nKoMsP/GN/X5h+vJnvhiCWxNMPP81Op0czBAgukBm627FTnsvieJOOrzyxb1s75+W\n56gJombmhzUfzr88AYY9mFy7diTw/oldDZcfwa8rvOAGJVDlyr2hqkLoGl+5jPex\nslt3NF4caE/wP9wPMgFRkmMOr8eiRhjlWLrO6mQdBp7Qsj3kEXioP+CZ1cv/sbaK\n4DM7VidB4PLrMFQMaf0LpjpC2DM=\n=wOl2\n-----END PGP PUBLIC KEY BLOCK-----\n", + "check_gpg": true + } + ], + "aarch64": [ + { + "name": "fedora", + "baseurl": "https://dl.fedoraproject.org/pub/fedora/linux/development/rawhide/Everything/aarch64/os/", + "gpgkey": "-----BEGIN PGP PUBLIC KEY BLOCK-----\n\nmQINBGPQTCwBEADFUL0EQLzwpKHtlPkacVI156F2LnWp6K69g/6yzllidHI3b7EV\nQgQ9/Kdou6wNuOahNKa6WcEi6grEXexD7pAcu4xdRUp79XxQy5pC7Aq2/Dwf0vRL\n2y0kqof+C7iSzhHsfLoaqKKeh2njAo1KLZXYTHAWAMbXEyO/FJevaHLXe2+yYd7j\nluD58gyXgGDXXJ2lymLqs2jobjWdmGPNZGFl36RP3Dnk0FpbdH78kyIIsc2foYuF\n00rnuumwCtK3V58VOZo6IkaYk2irdyeetmJjVHwLHwJB3EaAwGy9Z2oAH3LxxFfk\nrQb0DH0Nzb3fpEziopOOqSi+6guV4RHUKAkCUMu+Mo5XwFVPUAIfNRTVqoIaEasC\nWO26lhkB87wwIvyb/TPGSeh6laHPRf0QOUOLkugdkSHoaJFWoTCcu9Y4aeDpf+ZQ\nfMVmkJNRS1tXONgz+pDk1rro/tNrkusYG18xjvSZTB0P0C4b4+jgK5l7me0NU6G3\nWw/hIng5lxWfXgE9bpxlN834v1xy5Z3v17guJu1ec/jzKzQQ4356wyegXURjYoWe\nawcnK1S+9gxivnkOk1bGLNxrEh5vB6PDcI1VQ1ECH50EHyvE1IXJDaaStdAkacv2\nqHcd15CnlBW1LYFj0CHs/sGu9FD0iSF95OVRX4gjg9Wa4f8KvtEO/f+FeQARAQAB\ntDFGZWRvcmEgKDQwKSA8ZmVkb3JhLTQwLXByaW1hcnlAZmVkb3JhcHJvamVjdC5v\ncmc+iQJOBBMBCAA4FiEEEV35rvhXhT7oRF0KBydwfqFbecwFAmPQTCwCGw8FCwkI\nBwIGFQoJCAsCBBYCAwECHgECF4AACgkQBydwfqFbecxJOw//XaoJG3zN01bVM63H\nnFmMW/EnLzKrZqH8ZNq8CP9ycoc4q8SYcMprHKG9jufzj5/FhtpYecp3kBMpSYHt\nVu46LS9NajJDwdfvUMezVbieNIQ8icTR5s5IUYFlc47eG6PRe3k0n5fOPcIb6q82\nbyrK3dQnanOcVdoGU7QO9LAAHO9hg0zgZa0MxQAlDQov3dZcr7u7qGcQmU5JzcRS\nJgfDxHxDuMjmq6Kd0/UwD00kd2ptZgRls0ntXdm9CZGtQ/Q0baJ3eRzccpd/8bxy\nRWF9MnOdmV6ojcFKYECjEzcuheUlcKQH9rLkeBSfgrIlK3L7LG8bg5ouZLdx17rQ\nXABNQGmJTaGAiEnS/48G3roMS8R7fhUljcKr6t63QQQJ2qWdPvI6EMC2xKZsLHK4\nXiUvrmJpUprvEQSKBUOf/2zuXDBshtAnoKh7h5aG+TvozL4yNG5DKpSH3MRj1E43\nKoMsP/GN/X5h+vJnvhiCWxNMPP81Op0czBAgukBm627FTnsvieJOOrzyxb1s75+W\n56gJombmhzUfzr88AYY9mFy7diTw/oldDZcfwa8rvOAGJVDlyr2hqkLoGl+5jPex\nslt3NF4caE/wP9wPMgFRkmMOr8eiRhjlWLrO6mQdBp7Qsj3kEXioP+CZ1cv/sbaK\n4DM7VidB4PLrMFQMaf0LpjpC2DM=\n=wOl2\n-----END PGP PUBLIC KEY BLOCK-----\n", + "check_gpg": true + } + ] +} diff --git a/ostree-ng.sh b/ostree-ng.sh index 4f23d0317..99dc98f2c 100755 --- a/ostree-ng.sh +++ b/ostree-ng.sh @@ -122,28 +122,28 @@ case "${ID}-${VERSION_ID}" in DIRS_FILES_CUSTOMIZATION="true" ANSIBLE_OS_NAME="rhel-edge" ;; - "fedora-39") + "fedora-40") CONTAINER_IMAGE_TYPE=fedora-iot-container INSTALLER_IMAGE_TYPE=fedora-iot-installer - OSTREE_REF="fedora-iot/39/${ARCH}/iot" + OSTREE_REF="fedora-iot/40/${ARCH}/iot" OS_VARIANT="fedora-unknown" ANSIBLE_OS_NAME="fedora-iot" SYSROOT_RO="true" DIRS_FILES_CUSTOMIZATION="true" ;; - "fedora-40") + "fedora-41") CONTAINER_IMAGE_TYPE=fedora-iot-container INSTALLER_IMAGE_TYPE=fedora-iot-installer - OSTREE_REF="fedora-iot/40/${ARCH}/iot" + OSTREE_REF="fedora-iot/41/${ARCH}/iot" OS_VARIANT="fedora-unknown" ANSIBLE_OS_NAME="fedora-iot" SYSROOT_RO="true" DIRS_FILES_CUSTOMIZATION="true" ;; - "fedora-41") + "fedora-42") CONTAINER_IMAGE_TYPE=fedora-iot-container INSTALLER_IMAGE_TYPE=fedora-iot-installer - OSTREE_REF="fedora-iot/41/${ARCH}/iot" + OSTREE_REF="fedora-iot/42/${ARCH}/iot" OS_VARIANT="fedora-rawhide" ANSIBLE_OS_NAME="fedora-iot" SYSROOT_RO="true" diff --git a/ostree-raw-image.sh b/ostree-raw-image.sh index 698181dec..be1e6db88 100755 --- a/ostree-raw-image.sh +++ b/ostree-raw-image.sh @@ -103,10 +103,10 @@ case "${ID}-${VERSION_ID}" in SYSROOT_RO="true" ANSIBLE_OS_NAME="rhel-edge" ;; - "fedora-39") + "fedora-40") CONTAINER_TYPE=fedora-iot-container RAW_TYPE=iot-raw-image - OSTREE_REF="fedora/39/${ARCH}/iot" + OSTREE_REF="fedora/40/${ARCH}/iot" OS_VARIANT="fedora-unknown" ADD_SSSD="false" ANSIBLE_OS_NAME="fedora-iot" @@ -114,10 +114,10 @@ case "${ID}-${VERSION_ID}" in REF_PREFIX="fedora-iot" SYSROOT_RO="true" ;; - "fedora-40") + "fedora-41") CONTAINER_TYPE=fedora-iot-container RAW_TYPE=iot-raw-image - OSTREE_REF="fedora/40/${ARCH}/iot" + OSTREE_REF="fedora/41/${ARCH}/iot" OS_VARIANT="fedora-unknown" ADD_SSSD="false" ANSIBLE_OS_NAME="fedora-iot" @@ -125,10 +125,10 @@ case "${ID}-${VERSION_ID}" in REF_PREFIX="fedora-iot" SYSROOT_RO="true" ;; - "fedora-41") + "fedora-42") CONTAINER_TYPE=fedora-iot-container RAW_TYPE=iot-raw-image - OSTREE_REF="fedora/41/${ARCH}/iot" + OSTREE_REF="fedora/42/${ARCH}/iot" OS_VARIANT="fedora-rawhide" ADD_SSSD="false" ANSIBLE_OS_NAME="fedora-iot" diff --git a/ostree.sh b/ostree.sh index 11dc29d1b..683abca0a 100755 --- a/ostree.sh +++ b/ostree.sh @@ -106,32 +106,32 @@ case "${ID}-${VERSION_ID}" in SYSROOT_RO="true" DIRS_FILES_CUSTOMIZATION="true" ;; - "fedora-39") + "fedora-40") IMAGE_TYPE=fedora-iot-commit USER_IN_COMMIT="false" - OSTREE_REF="fedora/39/${ARCH}/iot" + OSTREE_REF="fedora/40/${ARCH}/iot" OS_VARIANT="fedora-unknown" - BOOT_LOCATION="https://dl.fedoraproject.org/pub/fedora/linux/releases/39/Everything/x86_64/os/" + BOOT_LOCATION="https://dl.fedoraproject.org/pub/fedora/linux/releases/40/Everything/x86_64/os/" CUT_DIRS=8 ADD_SSSD="false" SYSROOT_RO="true" DIRS_FILES_CUSTOMIZATION="true" ;; - "fedora-40") + "fedora-41") IMAGE_TYPE=fedora-iot-commit USER_IN_COMMIT="false" - OSTREE_REF="fedora/40/${ARCH}/iot" + OSTREE_REF="fedora/41/${ARCH}/iot" OS_VARIANT="fedora-unknown" - BOOT_LOCATION="https://dl.fedoraproject.org/pub/fedora/linux/releases/40/Everything/x86_64/os/" + BOOT_LOCATION="https://dl.fedoraproject.org/pub/fedora/linux/development/41/Everything/x86_64/os/" CUT_DIRS=8 ADD_SSSD="false" SYSROOT_RO="true" DIRS_FILES_CUSTOMIZATION="true" ;; - "fedora-41") + "fedora-42") IMAGE_TYPE=fedora-iot-commit USER_IN_COMMIT="false" - OSTREE_REF="fedora/41/${ARCH}/iot" + OSTREE_REF="fedora/42/${ARCH}/iot" OS_VARIANT="fedora-rawhide" BOOT_LOCATION="https://dl.fedoraproject.org/pub/fedora/linux/development/rawhide/Everything/x86_64/os/" CUT_DIRS=8 diff --git a/setup.sh b/setup.sh index a23dd9ead..0c2dd2844 100755 --- a/setup.sh +++ b/setup.sh @@ -92,23 +92,15 @@ case "${ID}-${VERSION_ID}" in "centos-9") sudo cp files/centos-stream-8.json /etc/osbuild-composer/repositories/centos-8.json sudo cp files/centos-stream-9.json /etc/osbuild-composer/repositories/centos-9.json;; - "fedora-37") - # workaround for bug https://bugzilla.redhat.com/show_bug.cgi?id=2162815 - sudo dnf install -y nghttp2 - sudo cp files/fedora-37.json /etc/osbuild-composer/repositories/fedora-37.json - ;; - "fedora-38") - sudo cp files/fedora-38.json /etc/osbuild-composer/repositories/fedora-38.json - ;; - "fedora-39") - sudo cp files/fedora-39.json /etc/osbuild-composer/repositories/fedora-39.json - ;; "fedora-40") sudo cp files/fedora-40.json /etc/osbuild-composer/repositories/fedora-40.json ;; "fedora-41") sudo cp files/fedora-41.json /etc/osbuild-composer/repositories/fedora-41.json ;; + "fedora-42") + sudo cp files/fedora-42.json /etc/osbuild-composer/repositories/fedora-42.json + ;; *) echo "unsupported distro: ${ID}-${VERSION_ID}" exit 1;; diff --git a/tools/playbook/group_vars/all b/tools/playbook/group_vars/all index 8de02282e..12a6db985 100644 --- a/tools/playbook/group_vars/all +++ b/tools/playbook/group_vars/all @@ -58,6 +58,7 @@ images: fedora-38: edge-fedora-38 fedora-39: edge-fedora-39 fedora-40: edge-fedora-40 + fedora-41: edge-fedora-41 fedora-rawhide: edge-fedora-rawhide image_url: @@ -67,6 +68,7 @@ image_url: fedora-38: https://dl.fedoraproject.org/pub/fedora/linux/releases/38/Cloud/x86_64/images fedora-39: https://dl.fedoraproject.org/pub/fedora/linux/releases/39/Cloud/x86_64/images fedora-40: https://dl.fedoraproject.org/pub/fedora/linux/development/40/Cloud/x86_64/images + fedora-41: https://dl.fedoraproject.org/pub/fedora/linux/development/41/Cloud/x86_64/images fedora-rawhide: https://dl.fedoraproject.org/pub/fedora/linux/development/rawhide/Cloud/x86_64/images os_distro: @@ -76,4 +78,5 @@ os_distro: fedora-38: fedora fedora-39: fedora fedora-40: fedora + fedora-41: fedora fedora-rawhide: fedora