diff options
author | Jonathan Lebon <jonathan@jlebon.com> | 2020-03-13 14:35:53 -0400 |
---|---|---|
committer | Jonathan Lebon <jonathan@jlebon.com> | 2020-03-13 14:35:53 -0400 |
commit | cbb3f0a8c2265a0124f94296f4780a51ffce3a22 (patch) | |
tree | be887960e9267179011b42ec9473b3ef91411951 | |
parent | 94ccbcca5e08ca12c280a7428fd01cd73d300071 (diff) | |
download | ostree-cbb3f0a8c2265a0124f94296f4780a51ffce3a22.tar.gz |
ci: use `fcosKola` for running kola tests
We were using `--no-test-exit-error` for upgrade tests but weren't
actually checking for test failures after.
Instead of running kola directly, just use the `fcosKola` custom step
which automatically takes care of e.g. running tests in parallel and
archiving results.
-rw-r--r-- | .cci.jenkinsfile | 15 |
1 files changed, 1 insertions, 14 deletions
diff --git a/.cci.jenkinsfile b/.cci.jenkinsfile index a83adeea..eaa976f5 100644 --- a/.cci.jenkinsfile +++ b/.cci.jenkinsfile @@ -77,20 +77,7 @@ parallel fcos: { coreos-assembler build """) } - stage("FCOS basic") { - timeout(time: 30, unit: 'MINUTES') { - shwrap("cosa kola run --basic-qemu-scenarios") - } - } - stage("FCOS upgrades") { - timeout(time: 30, unit: 'MINUTES') { - shwrap(""" - cosa kola --upgrades --no-test-exit-error - tar -cf - tmp/kola-upgrade | xz -c9 > kola-run-upgrade.tar.xz - """) - archiveArtifacts "kola-run-upgrade.tar.xz" - } - } + fcosKola("${env.WORKSPACE}") } }, buildopts: { |