From 5ff974bd0d37a56714d1f0ab5051469575eff269 Mon Sep 17 00:00:00 2001
From: Jonathan Lebon <jonathan@jlebon.com>
Date: Mon, 11 Sep 2023 15:31:05 -0400
Subject: [PATCH] ci: run cosa unprivileged temporarily for virtiofs bug

As a temporary workaround for a virtiofs bug:
https://gitlab.com/virtio-fs/virtiofsd/-/merge_requests/197

xref: https://github.com/coreos/coreos-assembler/pull/3428
---
 .cci.jenkinsfile | 23 ++++++++++++++++++-----
 1 file changed, 18 insertions(+), 5 deletions(-)

diff --git a/.cci.jenkinsfile b/.cci.jenkinsfile
index 70a3b17ea..44da9529a 100644
--- a/.cci.jenkinsfile
+++ b/.cci.jenkinsfile
@@ -19,18 +19,31 @@ cosaPod(buildroot: true, runAsUser: 0) {
     // Make sure cosa is using the binary we just built.
     shwrap("rsync -rlv install/usr/ /usr/")
 
-    cosaBuild(skipKola: true, overlays: ["install"])
+    // XXX: temporarily build FCOS manually until virtiofs can work with uid 0
+    // https://gitlab.com/virtio-fs/virtiofsd/-/merge_requests/197
+    //cosaBuild(skipKola: true, overlays: ["install"])
+    shwrap("""
+        if [ "\$(id -u)" = 0 ]; then
+            exec runuser -u builder -- bash "\$0" "\$@"
+        fi
+        mkdir -p /srv/coreos && cd /srv/coreos
+        cosa init https://github.com/coreos/fedora-coreos-config
+        rsync -av install/ /srv/coreos/overrides/rootfs
+        cosa fetch --strict
+        cosa build --strict --force
+    """)
+
     // Skipping kdump.crash due to CI failure in coreos-installer repo
     // https://github.com/coreos/fedora-coreos-tracker/issues/1075
     kola(extraArgs: "--denylist-test ext.config.kdump.crash")
 
     stage("Build metal+live") {
-        shwrap("cd /srv/coreos && cosa buildextend-metal")
-        shwrap("cd /srv/coreos && cosa buildextend-metal4k")
-        shwrap("cd /srv/coreos && cosa buildextend-live --fast")
+        shwrap("cd /srv/coreos && runuser -u builder -- cosa buildextend-metal")
+        shwrap("cd /srv/coreos && runuser -u builder -- cosa buildextend-metal4k")
+        shwrap("cd /srv/coreos && runuser -u builder -- cosa buildextend-live --fast")
         // Test metal with an uncompressed image and metal4k with a
         // compressed one
-        shwrap("cd /srv/coreos && cosa compress --fast --artifact=metal4k")
+        shwrap("cd /srv/coreos && runuser -u builder -- cosa compress --fast --artifact=metal4k")
     }
     stage("Test ISO") {
         // No need to run the iso-live-login/iso-as-disk scenarios