Skip to content

Commit

Permalink
ci: Fix case where cosa != buildroot
Browse files Browse the repository at this point in the history
We can't override host binaries in this case.  We'll need
to watch carefully and verify we're still testing things.
  • Loading branch information
cgwalters committed Nov 20, 2022
1 parent 8229c6d commit 406bfc7
Showing 1 changed file with 7 additions and 2 deletions.
9 changes: 7 additions & 2 deletions .cci.jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ stage("Build") {
shwrap("""
make install DESTDIR=\$(pwd)/installed/rootfs
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'
Expand All @@ -47,8 +48,12 @@ cosaPod(runAsUser: 0, memory: "9Gi", cpu: "4") {
checkout scm
unstash 'build'
shwrap("""
# Move the bits into the cosa pod
rsync -rlv installed/rootfs/ /
# 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/ /
coreos-assembler init --force https://github.com/coreos/fedora-coreos-config
mkdir -p overrides/rootfs
Expand Down

0 comments on commit 406bfc7

Please sign in to comment.