tree: import changes from testing-devel at cdeb862e26

2026-02-05 09:45:30 +01:00 · 2026-01-07 14:27:24 +00:00
parent a45d194f4b
commit f18e00912c
20 changed files with 104 additions and 20 deletions
--- a/.tekton/base/base/fedora-coreos.yaml
+++ b/.tekton/base/base/fedora-coreos.yaml
@@ -42,7 +42,7 @@ spec:
  pipelineRef:
    params:
    - name: bundle
-      value: quay.io/bootc-devel/tekton-catalog/pipeline-buildah-build-bootc-multi-platform-oci-ta@sha256:5bcbc7d13dbd3f2420df1014ad60468c376f574ff29912131b610702daec79fb
+      value: quay.io/bootc-devel/tekton-catalog/pipeline-buildah-build-bootc-multi-platform-oci-ta@sha256:d29a4d1bc4f331a327e23d96ba48e4cdd2d8e732078faf6970dd9657e9b817e6
    - name: name
      value: buildah-build-bootc-multi-platform-oci-ta
    - name: kind
--- a/.tekton/base/on-pull-request/fedora-coreos-on-pull-request.yaml
+++ b/.tekton/base/on-pull-request/fedora-coreos-on-pull-request.yaml
@@ -44,7 +44,7 @@ spec:
  pipelineRef:
    params:
    - name: bundle
-      value: quay.io/bootc-devel/tekton-catalog/pipeline-buildah-build-bootc-multi-platform-oci-ta@sha256:5bcbc7d13dbd3f2420df1014ad60468c376f574ff29912131b610702daec79fb
+      value: quay.io/bootc-devel/tekton-catalog/pipeline-buildah-build-bootc-multi-platform-oci-ta@sha256:d29a4d1bc4f331a327e23d96ba48e4cdd2d8e732078faf6970dd9657e9b817e6
    - name: name
      value: buildah-build-bootc-multi-platform-oci-ta
    - name: kind
--- a/.tekton/base/on-push/fedora-coreos-on-push.yaml
+++ b/.tekton/base/on-push/fedora-coreos-on-push.yaml
@@ -41,7 +41,7 @@ spec:
  pipelineRef:
    params:
    - name: bundle
-      value: quay.io/bootc-devel/tekton-catalog/pipeline-buildah-build-bootc-multi-platform-oci-ta@sha256:5bcbc7d13dbd3f2420df1014ad60468c376f574ff29912131b610702daec79fb
+      value: quay.io/bootc-devel/tekton-catalog/pipeline-buildah-build-bootc-multi-platform-oci-ta@sha256:d29a4d1bc4f331a327e23d96ba48e4cdd2d8e732078faf6970dd9657e9b817e6
    - name: name
      value: buildah-build-bootc-multi-platform-oci-ta
    - name: kind
--- a/.tekton/branched/on-pull-request/fedora-coreos-branched-on-pull-request.yaml
+++ b/.tekton/branched/on-pull-request/fedora-coreos-branched-on-pull-request.yaml
@@ -45,7 +45,7 @@ spec:
  pipelineRef:
    params:
    - name: bundle
-      value: quay.io/bootc-devel/tekton-catalog/pipeline-buildah-build-bootc-multi-platform-oci-ta@sha256:5bcbc7d13dbd3f2420df1014ad60468c376f574ff29912131b610702daec79fb
+      value: quay.io/bootc-devel/tekton-catalog/pipeline-buildah-build-bootc-multi-platform-oci-ta@sha256:d29a4d1bc4f331a327e23d96ba48e4cdd2d8e732078faf6970dd9657e9b817e6
    - name: name
      value: buildah-build-bootc-multi-platform-oci-ta
    - name: kind
--- a/.tekton/branched/on-push/fedora-coreos-branched-on-push.yaml
+++ b/.tekton/branched/on-push/fedora-coreos-branched-on-push.yaml
@@ -42,7 +42,7 @@ spec:
  pipelineRef:
    params:
    - name: bundle
-      value: quay.io/bootc-devel/tekton-catalog/pipeline-buildah-build-bootc-multi-platform-oci-ta@sha256:5bcbc7d13dbd3f2420df1014ad60468c376f574ff29912131b610702daec79fb
+      value: quay.io/bootc-devel/tekton-catalog/pipeline-buildah-build-bootc-multi-platform-oci-ta@sha256:d29a4d1bc4f331a327e23d96ba48e4cdd2d8e732078faf6970dd9657e9b817e6
    - name: name
      value: buildah-build-bootc-multi-platform-oci-ta
    - name: kind
--- a/.tekton/next-devel/on-pull-request/fedora-coreos-next-devel-on-pull-request.yaml
+++ b/.tekton/next-devel/on-pull-request/fedora-coreos-next-devel-on-pull-request.yaml
@@ -45,7 +45,7 @@ spec:
  pipelineRef:
    params:
    - name: bundle
-      value: quay.io/bootc-devel/tekton-catalog/pipeline-buildah-build-bootc-multi-platform-oci-ta@sha256:5bcbc7d13dbd3f2420df1014ad60468c376f574ff29912131b610702daec79fb
+      value: quay.io/bootc-devel/tekton-catalog/pipeline-buildah-build-bootc-multi-platform-oci-ta@sha256:d29a4d1bc4f331a327e23d96ba48e4cdd2d8e732078faf6970dd9657e9b817e6
    - name: name
      value: buildah-build-bootc-multi-platform-oci-ta
    - name: kind
--- a/.tekton/next-devel/on-push/fedora-coreos-next-devel-on-push.yaml
+++ b/.tekton/next-devel/on-push/fedora-coreos-next-devel-on-push.yaml
@@ -42,7 +42,7 @@ spec:
  pipelineRef:
    params:
    - name: bundle
-      value: quay.io/bootc-devel/tekton-catalog/pipeline-buildah-build-bootc-multi-platform-oci-ta@sha256:5bcbc7d13dbd3f2420df1014ad60468c376f574ff29912131b610702daec79fb
+      value: quay.io/bootc-devel/tekton-catalog/pipeline-buildah-build-bootc-multi-platform-oci-ta@sha256:d29a4d1bc4f331a327e23d96ba48e4cdd2d8e732078faf6970dd9657e9b817e6
    - name: name
      value: buildah-build-bootc-multi-platform-oci-ta
    - name: kind
--- a/.tekton/next/on-pull-request/fedora-coreos-next-on-pull-request.yaml
+++ b/.tekton/next/on-pull-request/fedora-coreos-next-on-pull-request.yaml
@@ -45,7 +45,7 @@ spec:
  pipelineRef:
    params:
    - name: bundle
-      value: quay.io/bootc-devel/tekton-catalog/pipeline-buildah-build-bootc-multi-platform-oci-ta@sha256:5bcbc7d13dbd3f2420df1014ad60468c376f574ff29912131b610702daec79fb
+      value: quay.io/bootc-devel/tekton-catalog/pipeline-buildah-build-bootc-multi-platform-oci-ta@sha256:d29a4d1bc4f331a327e23d96ba48e4cdd2d8e732078faf6970dd9657e9b817e6
    - name: name
      value: buildah-build-bootc-multi-platform-oci-ta
    - name: kind
--- a/.tekton/next/on-push/fedora-coreos-next-on-push.yaml
+++ b/.tekton/next/on-push/fedora-coreos-next-on-push.yaml
@@ -42,7 +42,7 @@ spec:
  pipelineRef:
    params:
    - name: bundle
-      value: quay.io/bootc-devel/tekton-catalog/pipeline-buildah-build-bootc-multi-platform-oci-ta@sha256:5bcbc7d13dbd3f2420df1014ad60468c376f574ff29912131b610702daec79fb
+      value: quay.io/bootc-devel/tekton-catalog/pipeline-buildah-build-bootc-multi-platform-oci-ta@sha256:d29a4d1bc4f331a327e23d96ba48e4cdd2d8e732078faf6970dd9657e9b817e6
    - name: name
      value: buildah-build-bootc-multi-platform-oci-ta
    - name: kind
--- a/.tekton/rawhide/on-pull-request/fedora-coreos-rawhide-on-pull-request.yaml
+++ b/.tekton/rawhide/on-pull-request/fedora-coreos-rawhide-on-pull-request.yaml
@@ -45,7 +45,7 @@ spec:
  pipelineRef:
    params:
    - name: bundle
-      value: quay.io/bootc-devel/tekton-catalog/pipeline-buildah-build-bootc-multi-platform-oci-ta@sha256:5bcbc7d13dbd3f2420df1014ad60468c376f574ff29912131b610702daec79fb
+      value: quay.io/bootc-devel/tekton-catalog/pipeline-buildah-build-bootc-multi-platform-oci-ta@sha256:d29a4d1bc4f331a327e23d96ba48e4cdd2d8e732078faf6970dd9657e9b817e6
    - name: name
      value: buildah-build-bootc-multi-platform-oci-ta
    - name: kind
--- a/.tekton/rawhide/on-push/fedora-coreos-rawhide-on-push.yaml
+++ b/.tekton/rawhide/on-push/fedora-coreos-rawhide-on-push.yaml
@@ -42,7 +42,7 @@ spec:
  pipelineRef:
    params:
    - name: bundle
-      value: quay.io/bootc-devel/tekton-catalog/pipeline-buildah-build-bootc-multi-platform-oci-ta@sha256:5bcbc7d13dbd3f2420df1014ad60468c376f574ff29912131b610702daec79fb
+      value: quay.io/bootc-devel/tekton-catalog/pipeline-buildah-build-bootc-multi-platform-oci-ta@sha256:d29a4d1bc4f331a327e23d96ba48e4cdd2d8e732078faf6970dd9657e9b817e6
    - name: name
      value: buildah-build-bootc-multi-platform-oci-ta
    - name: kind
--- a/.tekton/stable/on-pull-request/fedora-coreos-stable-on-pull-request.yaml
+++ b/.tekton/stable/on-pull-request/fedora-coreos-stable-on-pull-request.yaml
@@ -45,7 +45,7 @@ spec:
  pipelineRef:
    params:
    - name: bundle
-      value: quay.io/bootc-devel/tekton-catalog/pipeline-buildah-build-bootc-multi-platform-oci-ta@sha256:5bcbc7d13dbd3f2420df1014ad60468c376f574ff29912131b610702daec79fb
+      value: quay.io/bootc-devel/tekton-catalog/pipeline-buildah-build-bootc-multi-platform-oci-ta@sha256:d29a4d1bc4f331a327e23d96ba48e4cdd2d8e732078faf6970dd9657e9b817e6
    - name: name
      value: buildah-build-bootc-multi-platform-oci-ta
    - name: kind
--- a/.tekton/stable/on-push/fedora-coreos-stable-on-push.yaml
+++ b/.tekton/stable/on-push/fedora-coreos-stable-on-push.yaml
@@ -42,7 +42,7 @@ spec:
  pipelineRef:
    params:
    - name: bundle
-      value: quay.io/bootc-devel/tekton-catalog/pipeline-buildah-build-bootc-multi-platform-oci-ta@sha256:5bcbc7d13dbd3f2420df1014ad60468c376f574ff29912131b610702daec79fb
+      value: quay.io/bootc-devel/tekton-catalog/pipeline-buildah-build-bootc-multi-platform-oci-ta@sha256:d29a4d1bc4f331a327e23d96ba48e4cdd2d8e732078faf6970dd9657e9b817e6
    - name: name
      value: buildah-build-bootc-multi-platform-oci-ta
    - name: kind
--- a/.tekton/testing-devel/on-pull-request/fedora-coreos-testing-devel-on-pull-request.yaml
+++ b/.tekton/testing-devel/on-pull-request/fedora-coreos-testing-devel-on-pull-request.yaml
@@ -45,7 +45,7 @@ spec:
  pipelineRef:
    params:
    - name: bundle
-      value: quay.io/bootc-devel/tekton-catalog/pipeline-buildah-build-bootc-multi-platform-oci-ta@sha256:5bcbc7d13dbd3f2420df1014ad60468c376f574ff29912131b610702daec79fb
+      value: quay.io/bootc-devel/tekton-catalog/pipeline-buildah-build-bootc-multi-platform-oci-ta@sha256:d29a4d1bc4f331a327e23d96ba48e4cdd2d8e732078faf6970dd9657e9b817e6
    - name: name
      value: buildah-build-bootc-multi-platform-oci-ta
    - name: kind
--- a/.tekton/testing-devel/on-push/fedora-coreos-testing-devel-on-push.yaml
+++ b/.tekton/testing-devel/on-push/fedora-coreos-testing-devel-on-push.yaml
@@ -42,7 +42,7 @@ spec:
  pipelineRef:
    params:
    - name: bundle
-      value: quay.io/bootc-devel/tekton-catalog/pipeline-buildah-build-bootc-multi-platform-oci-ta@sha256:5bcbc7d13dbd3f2420df1014ad60468c376f574ff29912131b610702daec79fb
+      value: quay.io/bootc-devel/tekton-catalog/pipeline-buildah-build-bootc-multi-platform-oci-ta@sha256:d29a4d1bc4f331a327e23d96ba48e4cdd2d8e732078faf6970dd9657e9b817e6
    - name: name
      value: buildah-build-bootc-multi-platform-oci-ta
    - name: kind
--- a/.tekton/testing/on-pull-request/fedora-coreos-testing-on-pull-request.yaml
+++ b/.tekton/testing/on-pull-request/fedora-coreos-testing-on-pull-request.yaml
@@ -45,7 +45,7 @@ spec:
  pipelineRef:
    params:
    - name: bundle
-      value: quay.io/bootc-devel/tekton-catalog/pipeline-buildah-build-bootc-multi-platform-oci-ta@sha256:5bcbc7d13dbd3f2420df1014ad60468c376f574ff29912131b610702daec79fb
+      value: quay.io/bootc-devel/tekton-catalog/pipeline-buildah-build-bootc-multi-platform-oci-ta@sha256:d29a4d1bc4f331a327e23d96ba48e4cdd2d8e732078faf6970dd9657e9b817e6
    - name: name
      value: buildah-build-bootc-multi-platform-oci-ta
    - name: kind
--- a/.tekton/testing/on-push/fedora-coreos-testing-on-push.yaml
+++ b/.tekton/testing/on-push/fedora-coreos-testing-on-push.yaml
@@ -42,7 +42,7 @@ spec:
  pipelineRef:
    params:
    - name: bundle
-      value: quay.io/bootc-devel/tekton-catalog/pipeline-buildah-build-bootc-multi-platform-oci-ta@sha256:5bcbc7d13dbd3f2420df1014ad60468c376f574ff29912131b610702daec79fb
+      value: quay.io/bootc-devel/tekton-catalog/pipeline-buildah-build-bootc-multi-platform-oci-ta@sha256:d29a4d1bc4f331a327e23d96ba48e4cdd2d8e732078faf6970dd9657e9b817e6
    - name: name
      value: buildah-build-bootc-multi-platform-oci-ta
    - name: kind
--- a/.tekton/trigger
+++ b/.tekton/trigger
@@ -6,4 +6,4 @@
 # on the pipeline.
 # See https://github.com/coreos/fedora-coreos-tracker/issues/2038#issuecomment-3498258143
 # The format is YYYYMMDD
-20260106
+20260107
--- a/tests/kola/disks/dps-uuid
+++ b/tests/kola/disks/dps-uuid
@@ -0,0 +1,84 @@
+#!/bin/bash
+## kola:
+##   exclusive: false
+##   description: |
+##      Verify that block device partitions follow the Discoverable Parition Specification
+##      See: https://uapi-group.org/specifications/specs/discoverable_partitions_specification/
+
+set -euo pipefail
+
+# shellcheck disable=SC1091
+. "$KOLA_EXT_DATA/commonlib.sh"
+
+XBOOTLDR_UUID="BC13C2FF-59E6-4262-A352-B275FD6F7172"
+ESP_UUID="C12A7328-F81F-11D2-BA4B-00A0C93EC93B"
+
+case "$(uname -m)" in
+    x86_64)  ROOT_UUID="4F68BCE3-E8CD-4DB1-96E7-FBCAF984B709" ;;
+    aarch64) ROOT_UUID="B921B045-1DF0-41C3-AF44-4C6F280D3FAE" ;;
+    ppc64)   ROOT_UUID="912ADE1D-A839-4913-8964-A10EEE08FBD2" ;;
+    ppc64le) ROOT_UUID="C31C45E6-3F39-412E-80FB-4809C4980599" ;;
+    s390x)   ROOT_UUID="5EEAD9A9-FE09-4A1E-A1D7-520D00531306" ;;
+    riscv64) ROOT_UUID="72EC70A6-CF74-40E6-BD49-4BDA08E8F224" ;;
+
+    *)
+        echo "Unsupported architecture: $(uname -m)" >&2
+        exit 1
+        ;;
+esac
+
+# get root mount major:minor
+DEV_MAJ_MIN="$(findmnt -no MAJ:MIN /sysroot | tr -d '[:space:]')"
+[[ -n "$DEV_MAJ_MIN" ]] || fatal "Failed to determine MAJ:MIN for /sysroot"
+
+# get backing block device
+DEVICE="$(basename "$(dirname "$(readlink -f "/sys/dev/block/$DEV_MAJ_MIN")")")"
+[[ -b "/dev/$DEVICE" ]] || fatal "Block device /dev/$DEVICE not found"
+
+# get partitions
+LSBLK_JSON="$(lsblk -o name,parttype,uuid,mountpoint,parttypename,label --json "/dev/$DEVICE")"
+
+
+# NOTE: Not adding a check for whether we found the XBootldr
+# partition or not as there would be a few cases where it won't be used
+# Ex. In composefs-native UKI case
+root_found=0
+esp_found=0
+
+while read -r part; do
+    label="$(jq -r '.label // empty' <<<"$part")"
+    parttype="$(jq -r '.parttype // empty' <<<"$part" | tr '[:lower:]' '[:upper:]')"
+    name="$(jq -r '.name' <<<"$part")"
+
+    [[ -n "$label" ]] || continue
+    [[ -n "$parttype" ]] || fatal "Partition '$name' has no parttype"
+
+    case "$label" in
+        boot)
+            [[ "$parttype" == "$XBOOTLDR_UUID" ]] || \
+                fatal "Partition '$label' does not have DPS UUID. Have: $parttype, Need: $XBOOTLDR_UUID"
+            ;;
+        root)
+            root_found=1
+            [[ "$parttype" == "$ROOT_UUID" ]] || \
+                fatal "Partition '$label' does not have DPS UUID. Have: $parttype, Need: $ROOT_UUID"
+            ;;
+        EFI-SYSTEM)
+            esp_found=1
+            [[ "$parttype" == "$ESP_UUID" ]] || \
+                fatal "Partition '$label' does not have DPS UUID. Have: $parttype, Need: $ESP_UUID"
+            ;;
+    esac
+done < <(echo "$LSBLK_JSON" | jq -c '.blockdevices[0].children[]?')
+
+[[ "$root_found" -eq 1 ]] || fatal "Root partition not found"
+
+case "$(uname -m)" in
+    # This list is taken from
+    # https://github.com/coreos/coreos-assembler/tree/c9a1e313f92eb5d9153c220c1f14f65a99fb305b/src/osbuild-manifests
+    x86_64|aarch64|riscv64)
+        [[ "$esp_found" -eq 1 ]] || fatal "EFI partition not found"
+    ;;
+esac
+
+echo "DPS UUID test passed"
--- a/tests/kola/kdump/crash/config.bu
+++ b/tests/kola/kdump/crash/config.bu
@@ -6,8 +6,8 @@ kernel_arguments:
    # and RHCOS here. Currently the worst case output of `kdumpctl estimate`
    # is aarch64 RHCOS where the it says "Recommended crashkernel: 448M".
    # Though for some reason when we set crashkernel=448M ppc64le complains
-    # and wants 512M so let's set it to 512M here.
-    - crashkernel=512M
+    # and wants 528M so let's set it to 528M here.
+    - crashkernel=528M
 systemd:
  units:
    - name: kdump.service