From cbb3f0a8c2265a0124f94296f4780a51ffce3a22 Mon Sep 17 00:00:00 2001
From: Jonathan Lebon <jonathan@jlebon.com>
Date: Fri, 13 Mar 2020 14:35:53 -0400
Subject: [PATCH] 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.
---
 .cci.jenkinsfile | 15 +--------------
 1 file changed, 1 insertion(+), 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: {