Skip to content

Commit fa2a8a0

Browse files
dustymabeHuijingHei
authored andcommitted
ci: drop running COSA as UID 0
This shouldn't be necessary. Let's see if tests pass. Signed-off-by: Colin Walters <walters@verbum.org>
1 parent bb69ccf commit fa2a8a0

File tree

1 file changed

+4
-9
lines changed

1 file changed

+4
-9
lines changed

.cci.jenkinsfile

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -39,21 +39,16 @@ codestyle: {
3939

4040
// Build FCOS and do a kola basic run
4141
// The FCOS build process is memory-intensive; 7GiB is needed to prevent OOM errors.
42-
cosaPod(runAsUser: 0, memory: "7168Mi", cpu: "4") {
42+
cosaPod(memory: "7168Mi", cpu: "4") {
4343
stage("Build FCOS") {
4444
checkout scm
4545
unstash 'build'
46-
// Note that like {rpm-,}ostree we want to install to both / and overrides/rootfs
47-
// because bootupd is used both during the `rpm-ostree compose tree` as well as
48-
// inside the target operating system.
46+
// Install the built bootupd into the overrides dir
4947
shwrap("""
50-
mkdir insttree
51-
tar -C insttree -xzvf insttree.tar.gz
52-
rsync -rlv insttree/ /
5348
coreos-assembler init --force https://github.com/coreos/fedora-coreos-config
5449
mkdir -p overrides/rootfs
55-
mv insttree/* overrides/rootfs/
56-
rmdir insttree
50+
tar -C overrides/rootfs -xzvf insttree.tar.gz
51+
rm insttree.tar.gz
5752
cosa build
5853
cosa osbuild qemu metal4k
5954
""")

0 commit comments

Comments
 (0)