packaging
/
ostree
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ci: Fix case where cosa != buildroot 

We can't override host binaries in this case.  We'll need
to watch carefully and verify we're still testing things.
This commit is contained in:
Colin Walters 2022-11-18 10:42:58 -05:00
parent 8229c6d080
commit 406bfc78d1
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
.cci.jenkinsfile
View File

@ -34,6 +34,7 @@ stage("Build") {
shwrap(""" shwrap("""
make install DESTDIR=\$(pwd)/installed/rootfs make install DESTDIR=\$(pwd)/installed/rootfs
make -C tests/kolainst install DESTDIR=\$(pwd)/installed/tests make -C tests/kolainst install DESTDIR=\$(pwd)/installed/tests
bash -c '. /usr/lib/os-release && echo \$VERSION_ID' >\$(pwd)/installed/buildroot-id
""") """)
} }
stash includes: "installed/", name: 'build' stash includes: "installed/", name: 'build'
@ -47,8 +48,12 @@ cosaPod(runAsUser: 0, memory: "9Gi", cpu: "4") {
checkout scm checkout scm
unstash 'build' unstash 'build'
shwrap(""" shwrap("""
# Move the bits into the cosa pod # Move the bits into the cosa pod (but only if major versions match)
rsync -rlv installed/rootfs/ / 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/ / rsync -rlv installed/tests/ /
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 mkdir -p overrides/rootfs