diff --git a/.cci.jenkinsfile b/.cci.jenkinsfile index 7cb3ac17..b4002ecd 100644 --- a/.cci.jenkinsfile +++ b/.cci.jenkinsfile @@ -14,20 +14,20 @@ buildPod { } } -cosaPod(buildroot: true, runAsUser: 0) { +cosaPod { checkout scm unstash name: 'build' - // Delete the OS copy of coreos-installer so we don't test it by mistake - shwrap("rm /usr/bin/coreos-installer") - // Make sure cosa is using the binary we just built. - shwrap("rsync -rlv install/usr/ /usr/") + // Overwrite the `coreos-installer` that was a part of the COSA + // container with the one built here. This ensures we test the + // one that was built and not the one delivered by COSA. + shwrap(""" + rm -f /usr/bin/coreos-installer + cp install/usr/bin/coreos-installer /usr/bin/ + """) - cosaBuild(skipKola: true, overlays: ["install"]) - // Skipping kdump.crash due to CI failure in coreos-installer repo - // https://github.com/coreos/fedora-coreos-tracker/issues/1075 - kola(extraArgs: "--denylist-test ext.config.kdump.crash") + cosaBuild(overlays: ["install"]) stage("Build metal+live") { shwrap("cd /srv/coreos && cosa osbuild metal metal4k live") @@ -42,6 +42,9 @@ cosaPod(buildroot: true, runAsUser: 0) { ) } stage("Image tests") { + // Update the perms of the generated ISO so our tests can modify in place. + shwrap("find /srv/coreos/builds/ -name '*.iso' | xargs chmod -v 666") + // Run the tests! shwrap("COREOS_INSTALLER_TEST_INSTALLED_BINARY=1 tests/images.sh /srv/coreos/builds/latest/x86_64") } }