tier-1/gropwart: bail early on devicemapper targets

If the growpart script detects a DM target, exit early.

Signed-off-by: Micah Abbott <miabbott@redhat.com>

.pre-commit-config.yaml

@@ -1,7 +1,7 @@
 ---
 repos:
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v5.0.0
+    rev: v4.5.0
     hooks:
       - id: end-of-file-fixer
       - id: trailing-whitespace

Containerfile

@@ -23,7 +23,7 @@
 # Because it's generating a base image and uses containerbuildcontextization features itself.
 # In the future some of this can be lifted.
 
-FROM quay.io/fedora/fedora:40 as repos
+FROM quay.io/fedora/fedora:rawhide as repos
 
 FROM quay.io/centos-bootc/bootc-image-builder:latest as builder
 ARG MANIFEST=fedora-bootc.yaml

fedora-bootc-config.json

@@ -3,7 +3,7 @@
         "containers.bootc": "1",
         "bootc.diskimage-builder": "quay.io/centos-bootc/bootc-image-builder",
         "redhat.id": "fedora",
-        "redhat.version-id": "40"
+        "redhat.version-id": "rawhide"
     },
     "StopSignal": "SIGRTMIN+3",
     "Env": [

fedora-bootc.yaml

@@ -1,15 +1,12 @@
-releasever: 40
+releasever: rawhide
-variables:
-  distro: "fedora"
-
 repos:
-  - fedora
+  - rawhide
-  - updates
 
 metadata:
   name: fedora-boot-tier1
   summary: Fedora Bootable Tier 1
 
 include:
+  - fedora-generic.yaml
   - tier-1/manifest.yaml
   - tier-1/kernel.yaml

fedora-generic.yaml

@@ -0,0 +1,7 @@
+variables:
+  distro: "fedora"
+
+# Fedora-specific packages here
+packages:
+  # https://gitlab.com/fedora/bootc/base-images/-/issues/12
+  - fedora-repos-archive

fedora-tier-0.yaml

@@ -1,15 +1,12 @@
-releasever: 40
+releasever: rawhide
-variables:
-  distro: "fedora"
-
 repos:
-  - fedora-devel
+  - rawhide
-  - fedora-updates
 
 metadata:
   name: fedora-boot-tier0
   summary: Fedora Bootable Tier 0
 
 include:
+  - fedora-generic.yaml
   - tier-0/manifest.yaml
   - tier-0/kernel.yaml

renovate.json

@@ -3,10 +3,12 @@
   "extends": [
     "github>platform-engineering-org/.github"
   ],
+  "baseBranches": ["main", "f40"],
   "packageRules": [
     {
       "matchPackageNames": ["quay.io/fedora/fedora"],
-      "allowedVersions": "=40"
+      "allowedVersions": "=40",
+      "matchBaseBranches": ["f40"]
     }
   ]
 }

tier-0/manifest.yaml

@@ -50,6 +50,7 @@ remove-from-packages:
 
 include:
   - bootc.yaml
+  - bootupd.yaml
   - ostree.yaml
   - initramfs.yaml
   - autoupdates.yaml
@@ -65,8 +66,3 @@ packages:
   - container-selinux
   # Needed for tpm2 bound luks
   - tpm2-tools
-
-# See https://github.com/coreos/bootupd
-arch-include:
-  x86_64: bootupd.yaml
-  aarch64: bootupd.yaml

tier-1/bootc-generic-growpart

@@ -3,15 +3,18 @@ set -eu
 
 backing_device=$(findmnt -vno SOURCE /sysroot)
 echo "Backing device: ${backing_device}"
+
+# Handling devicemapper targets is a whole other thing
+case $backing_device in
+    /dev/mapper/*) echo "Not growing $backing_device"; exit 0 ;;
+esac
+
 syspath=/sys/class/block/$(basename "${backing_device}")
 if ! test -d "${syspath}"; then
     echo "failed to find backing device ${syspath}"; exit 1
 fi
 
-# Handling devicemapper targets is a whole other thing
+
-case $backing_device in
-    /dev/mapper/*) "Not growing $backing_device"; exit 0 ;;
-esac
 
 # Note that we expect that the rootfs is on a partition
 partition=$(cat "${syspath}"/partition)