From 166c392e3f054088b305a7936ed524288d1da221 Mon Sep 17 00:00:00 2001
From: Tobias Jungel <1773291+toanju@users.noreply.github.com>
Date: Wed, 15 Apr 2026 11:21:08 +0200
Subject: [PATCH] Add ignition from package repo

Until the upstream repo is updated we add the latest ignition package
from the github releases.

Update butane config version to 1.7.0 to generate 3.6.0 ignition.
---
 .../test/integration/build/dev-user-butane.yaml  |  2 +-
 .../test/integration/dependencies/action.yml     |  2 +-
 features/_usi/exec.config                        | 16 +++++++++++++++-
 features/_usi/pkg.exclude                        |  1 +
 4 files changed, 18 insertions(+), 3 deletions(-)
 create mode 100644 features/_usi/pkg.exclude

diff --git a/.github/actions/test/integration/build/dev-user-butane.yaml b/.github/actions/test/integration/build/dev-user-butane.yaml
index 9eb08a14..581c32d8 100644
--- a/.github/actions/test/integration/build/dev-user-butane.yaml
+++ b/.github/actions/test/integration/build/dev-user-butane.yaml
@@ -1,5 +1,5 @@
 variant: fcos
-version: 1.3.0
+version: 1.7.0
 passwd:
   users:
     - name: root
diff --git a/.github/actions/test/integration/dependencies/action.yml b/.github/actions/test/integration/dependencies/action.yml
index e1923df9..65fb700c 100644
--- a/.github/actions/test/integration/dependencies/action.yml
+++ b/.github/actions/test/integration/dependencies/action.yml
@@ -34,7 +34,7 @@ runs:
     - name: butane
       shell: bash
       run: |
-        BUTANE_VERSION="0.24.0"
+        BUTANE_VERSION="0.27.0"
         curl -LO "https://github.com/coreos/butane/releases/download/v${BUTANE_VERSION}/butane-x86_64-unknown-linux-gnu"
         chmod +x "butane-x86_64-unknown-linux-gnu"
         sudo mv "butane-x86_64-unknown-linux-gnu" /usr/local/bin/butane
diff --git a/features/_usi/exec.config b/features/_usi/exec.config
index 60b8d26b..7d98e508 100755
--- a/features/_usi/exec.config
+++ b/features/_usi/exec.config
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-set -eufo pipefail
+set -euo pipefail
 
 #TODO: oras should be pulled in via pkg.include, but we don't have it for 1877, will be in the next release
 pushd /tmp
@@ -19,3 +19,17 @@ mkdir -p /efi
 [ -e /usr/lib/systemd/systemd-pcrphase ] || ln -s systemd-pcrextend /usr/lib/systemd/systemd-pcrphase
 
 mkdir -p /var/etc.overlay /var/etc.overlay.workdir
+
+# temporary adding latest ignition until it is in the repo
+IGNITION_VERSION="2.26.0-0gl0%2Bbp1877"
+TEMP_DIR=$(mktemp -d)
+for p in "https://github.com/gardenlinux/package-ignition/releases/download/$IGNITION_VERSION/build.tar.xz.0000"; do
+  echo "Downloading and extracting package from $p"
+  wget -q "$p" -O - | xz -d | tar xf - -C "$TEMP_DIR"
+  ls "$TEMP_DIR"
+done
+
+pushd "$TEMP_DIR" > /dev/null
+dpkg -i ignition_*_amd64.deb
+popd > /dev/null
+rm -rf "$TEMP_DIR"
diff --git a/features/_usi/pkg.exclude b/features/_usi/pkg.exclude
new file mode 100644
index 00000000..df284caa
--- /dev/null
+++ b/features/_usi/pkg.exclude
@@ -0,0 +1 @@
+ignition