Skip to content

Commit 2bbfe4e

Browse files
authored
Merge pull request #2228 from nikita-dubrovskii/fold_testiso
.cci.jenkinsfile: drop testiso and run kola after all artifacts
2 parents 012abb9 + 9b4d51a commit 2bbfe4e

1 file changed

Lines changed: 10 additions & 8 deletions

File tree

.cci.jenkinsfile

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -58,19 +58,21 @@ cosaPod {
5858
// throw new Exception("No 1.6.0-experimental external tests found; comment out this workaround.")
5959
//}
6060

61+
// Build all artifacts before running tests, as iso.* tests are now folded into kola.
62+
stage("Build Artifacts") {
63+
shwrap("""
64+
cd /srv/coreos
65+
cosa osbuild metal metal4k live
66+
""")
67+
}
68+
6169
// we run the blackbox tests separately instead of as part of the main kola
6270
// run since it's a distinct kind of test and we want to draw more
6371
// attention to it in the Jenkins UI
64-
kola(extraArgs: "--denylist-test ext.*.blackbox")
65-
6672
parallel blackbox: {
6773
unstash name: 'blackbox'
6874
kola(extraArgs: "ext.*.blackbox", skipUpgrade: true)
69-
}, testiso: {
70-
shwrap("""
71-
cd /srv/coreos
72-
cosa osbuild metal metal4k live
73-
""")
74-
kolaTestIso()
75+
}, kola: {
76+
kola(extraArgs: "--denylist-test ext.*.blackbox")
7577
}
7678
}

0 commit comments

Comments
 (0)