summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2020-03-13 21:53:04 +0100
committerGitHub <noreply@github.com>2020-03-13 21:53:04 +0100
commit2d901957b8d102c569ce362a919798035455d229 (patch)
treebe887960e9267179011b42ec9473b3ef91411951
parent94ccbcca5e08ca12c280a7428fd01cd73d300071 (diff)
parentcbb3f0a8c2265a0124f94296f4780a51ffce3a22 (diff)
downloadostree-2d901957b8d102c569ce362a919798035455d229.tar.gz
Merge pull request #2029 from jlebon/pr/upgrade-tests
ci: use `fcosKola` for running kola tests
-rw-r--r--.cci.jenkinsfile15
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: {