Skip to content

Commit

Permalink
Revert "ci: Run cosa unprivileged"
Browse files Browse the repository at this point in the history
This reverts commit 2fe88f8.

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

coreos/coreos-assembler#3625
  • Loading branch information
jlebon committed Sep 19, 2023
1 parent 878d601 commit 9a66b6d
Showing 1 changed file with 8 additions and 7 deletions.
15 changes: 8 additions & 7 deletions .cci.jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -47,23 +47,24 @@ 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)
if test \$osver = \$buildroot_id; then
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}")
Expand Down

0 comments on commit 9a66b6d

Please sign in to comment.