tree: promote changes from testing-devel at f945860

.cci.jenkinsfile

@@ -42,10 +42,8 @@ cosaPod(cpus: 4, memory: "9Gi") {
     }
     cosaBuild(skipInit: true, noStrict: no_strict_build, extraFetchArgs: '--with-cosa-overrides', extraArgs: parent_arg)
 
-    parallel metal: {
-        shwrap("cd /srv/coreos && cosa buildextend-metal")
-    }, metal4k: {
-        shwrap("cd /srv/coreos && cosa buildextend-metal4k")
+    stage("Metal/Metal4k") {
+        shwrap("cd /srv/coreos && cosa osbuild metal metal4k")
     }
 
     stage("Test ISO") {

.github/workflows/add-override.yml

@@ -40,7 +40,10 @@ jobs:
     container: quay.io/fedora/fedora:latest
     steps:
       - name: Install dependencies
-        run: dnf install -y git jq python3-bodhi-client python3-pyyaml
+        # XXX: Note here we're installing python3-dnf, which pulls in libdnf,
+        # which is the old one. We should migrate to libdnf5 to match dnf5.
+        # https://github.com/coreos/fedora-coreos-config/issues/3254
+        run: dnf install -y git jq python3-bodhi-client python3-pyyaml python3-dnf
       - name: Check out repository
         uses: actions/checkout@v3
         with:

.github/workflows/bump-fedora-bootc.yaml

@@ -0,0 +1,66 @@
+name: Bump fedora-bootc submodule
+
+on:
+  schedule:
+    - cron: '0 */6 * * *'
+  workflow_dispatch:
+
+permissions:
+  contents: read
+
+jobs:
+  bump-fedora-bootc-submodule:
+    name: Bump fedora-bootc submodule
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+        with:
+          submodules: true
+          fetch-depth: 0
+      # https://github.com/actions/checkout/issues/766
+      - name: Mark git checkout as safe
+        run: git config --global --add safe.directory "$GITHUB_WORKSPACE"
+      - name: Check if there are new commits
+        run: |
+          previous_rev=$(git -C fedora-bootc rev-parse HEAD)
+          git submodule update --remote fedora-bootc
+          new_rev=$(git -C fedora-bootc rev-parse HEAD)
+          if [ "${previous_rev}" != "${new_rev}" ]; then
+              if git -C fedora-bootc diff --quiet "${previous_rev}" "${new_rev}" tier-0 tier-x; then
+                  # reset back any changes to avoid a PR bump
+                  git submodule update
+              fi
+          fi
+          if git diff --quiet --exit-code; then
+              echo "No tier-0 or tier-x changes; exiting"
+              exit 0
+          fi
+
+          git -C fedora-bootc shortlog --no-merges "${previous_rev}..${new_rev}" -- tier-0 tier-x > $RUNNER_TEMP/shortlog
+
+          marker=END-OF-LOG-MARKER-$RANDOM$RANDOM$RANDOM
+          cat >> $GITHUB_ENV <<EOF
+          SHORTLOG<<$marker
+          $(cat $RUNNER_TEMP/shortlog)
+          $marker
+          EOF
+      - name: Open pull request
+        uses: peter-evans/create-pull-request@v6
+        with:
+          token: ${{ secrets.COREOSBOT_RELENG_TOKEN }}
+          push-to-fork: coreosbot-releng/fedora-coreos-config
+          branch: bump-fedora-bootc
+          commit-message: |
+            Bump fedora-bootc submodule
+
+            ${{ env.SHORTLOG }}
+          title: "Bump fedora-bootc submodule"
+          body: |
+            Created by [GitHub workflow](${{ github.server_url }}/${{ github.repository }}/actions/workflows/bump-fedora-bootc.yml) ([source](${{ github.server_url }}/${{ github.repository }}/blob/testing-devel/.github/workflows/bump-fedora-bootc.yml)).
+
+            ```
+            ${{ env.SHORTLOG }}
+            ```
+          committer: "CoreOS Bot <[email protected]>"
+          author: "CoreOS Bot <[email protected]>"

.github/workflows/remove-graduated-overrides.yml

@@ -55,6 +55,7 @@ jobs:
         uses: actions/checkout@v3
         with:
           ref: ${{ matrix.branch }}
+          submodules: true
       # https://github.com/actions/checkout/issues/766
       - name: Mark git checkout as safe
         run: git config --global --add safe.directory "$GITHUB_WORKSPACE"

.github/workflows/shellcheck.yml

@@ -16,7 +16,7 @@ jobs:
     container: quay.io/coreos-assembler/fcos-buildroot:testing-devel
     steps:
       - name: Check out repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       # https://github.com/actions/checkout/issues/760
       - name: Mark git checkout as safe
         run: git config --global --add safe.directory "$GITHUB_WORKSPACE"

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "fedora-bootc"]
+	path = fedora-bootc
+	url = https://gitlab.com/fedora/bootc/base-images.git

kola-denylist.yaml

@@ -1,10 +1,6 @@
 # This file documents currently known-to-fail kola tests. It is consumed by
 # coreos-assembler to automatically skip some tests. For more information,
 # see: https://github.com/coreos/coreos-assembler/pull/866.
-- pattern: fcos.internet
-  tracker: https://github.com/coreos/coreos-assembler/pull/1478
-- pattern: podman.workflow
-  tracker: https://github.com/coreos/coreos-assembler/pull/1478
 - pattern: coreos.boot-mirror*
   tracker: https://github.com/coreos/fedora-coreos-tracker/issues/1659
   # warn: true (disabled on promotion)