From be2b2025c1b58be04714ac53ecaa219ee663f21d Mon Sep 17 00:00:00 2001 From: Colin Walters Date: Thu, 19 Mar 2020 15:16:10 +0000 Subject: [PATCH] fcosKola: Automatically pick up tests/kola So we can use `-E` in CI, see https://github.com/coreos/coreos-assembler/pull/1252 --- vars/fcosKola.groovy | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/vars/fcosKola.groovy b/vars/fcosKola.groovy index de66ade..3896773 100644 --- a/vars/fcosKola.groovy +++ b/vars/fcosKola.groovy @@ -3,8 +3,12 @@ def call(cosaDir = "/srv/fcos") { stage('Kola') { parallel run: { stage("run") { + def args = "" + if (shwrapRc("test -d tests/kola") == 0) { + args += "--exttest ${env.WORKSPACE}/tests/kola" + } try { - shwrap("cd ${cosaDir} && cosa kola run --parallel 8") + shwrap("cd ${cosaDir} && cosa kola run --parallel 8 ${args}") } finally { shwrap("tar -c -C ${cosaDir}/tmp kola | xz -c9 > ${env.WORKSPACE}/kola.tar.xz") archiveArtifacts allowEmptyArchive: true, artifacts: 'kola.tar.xz'