From: Jonathan Lebon <jonathan@jlebon.com>
Date: Tue, 19 Sep 2023 18:41:36 +0000 (-0400)
Subject: Revert "ci: Run cosa unprivileged"
X-Git-Tag: archive/raspbian/2023.7-3+rpi1^2~16^2^2~13^2
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=b8ce61ba7bb070ad8fddcead6cab3363bee07f48;p=ostree.git

Revert "ci: Run cosa unprivileged"

This reverts commit 2fe88f80fae83e206f811003a072c73ceebcea59.

This shouldn't be necessary now with the workaround built in cosa:

https://github.com/coreos/coreos-assembler/pull/3625
---

diff --git a/.cci.jenkinsfile b/.cci.jenkinsfile
index edae38a2..82e2d1ac 100644
--- a/.cci.jenkinsfile
+++ b/.cci.jenkinsfile
@@ -47,7 +47,6 @@ cosaPod(runAsUser: 0, memory: "9Gi", cpu: "4") {
     checkout scm
     unstash 'build'
     shwrap("""
-      chown -R -h builder: .
       # Move the bits into the cosa pod (but only if major versions match)
       buildroot_id=\$(cat installed/buildroot-id)
       osver=\$(. /usr/lib/os-release && echo \$VERSION_ID)
@@ -55,15 +54,17 @@ cosaPod(runAsUser: 0, memory: "9Gi", cpu: "4") {
         rsync -rlv installed/rootfs/ /
       fi
       rsync -rlv installed/tests/ /
-      runuser -u builder -- coreos-assembler init --force https://github.com/coreos/fedora-coreos-config
+      coreos-assembler init --force https://github.com/coreos/fedora-coreos-config
+      mkdir -p overrides/rootfs
       # And override the on-host bits
       mv installed/rootfs/* overrides/rootfs/
       rm installed -rf
-      runuser -u builder -- coreos-assembler fetch
-      runuser -u builder -- coreos-assembler build
-      runuser -u builder -- coreos-assembler buildextend-metal
-      runuser -u builder -- coreos-assembler buildextend-metal4k
-      runuser -u builder -- coreos-assembler buildextend-live --fast
+      coreos-assembler fetch
+      coreos-assembler build
+      coreos-assembler buildextend-metal
+      coreos-assembler buildextend-metal4k
+      coreos-assembler buildextend-live --fast
+
     """)
   }
   kola(cosaDir: "${env.WORKSPACE}")