Skip to content

Commit 9a149ea

Browse files
ci: run kola tests after all artifacts were built
testiso command no longer exists; ISO tests are now folded into kola
1 parent 6e7b4de commit 9a149ea

1 file changed

Lines changed: 10 additions & 5 deletions

File tree

.cci.jenkinsfile

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,20 +27,25 @@ cosaPod {
2727
cp install/usr/bin/coreos-installer /usr/bin/coreos-installer
2828
""")
2929

30-
cosaBuild(overlays: ["install"])
30+
// Don't run tests untill all artifacts are built.
31+
stage("Build") {
32+
cosaBuild(skipKola: true, overlays: ["install"])
33+
}
3134

32-
stage("Build metal+live") {
35+
stage("Build artifacts") {
3336
shwrap("cd /srv/coreos && cosa osbuild metal metal4k live")
3437
// Test metal with an uncompressed image and metal4k with a
3538
// compressed one
3639
shwrap("cd /srv/coreos && cosa compress --fast --artifact=metal4k")
3740
}
38-
stage("Test ISO") {
41+
42+
stage("Kola") {
3943
// No need to run the iso-live-login/iso-as-disk scenarios
40-
kolaTestIso(
41-
extraArgs: "--denylist-test iso-as-disk.* --denylist-test iso-live-login.*"
44+
kola(
45+
extraArgs: "--denylist-test iso.iso-as-disk* --denylist-test iso.iso-live-login*"
4246
)
4347
}
48+
4449
stage("Image tests") {
4550
// Update the perms of the generated ISO so our tests can modify in place.
4651
shwrap("find /srv/coreos/builds/ -name '*.iso' | xargs chmod -v 666")

0 commit comments

Comments
 (0)