diff options
| -rw-r--r-- | .cci.jenkinsfile | 19 |
1 files changed, 5 insertions, 14 deletions
diff --git a/.cci.jenkinsfile b/.cci.jenkinsfile index af9faed5..ce292899 100644 --- a/.cci.jenkinsfile +++ b/.cci.jenkinsfile @@ -40,9 +40,10 @@ stage("Build") { } } -// Build FCOS and do a kola basic run +// Build FCOS and run kola tests. +// Both fcosKola and fcosKolaTestIso require 4G max. Add 512M for overhead. stage("FCOS") { - cosaPod(runAsUser: 0, memory: "3072Mi", cpu: "4") { + cosaPod(runAsUser: 0, memory: "4608Mi", cpu: "4") { stage("Build FCOS") { checkout scm unstash 'build' @@ -63,17 +64,7 @@ stage("FCOS") { """) } - stage("Test") { - parallel metal: { - try { - shwrap("kola testiso -S --scenarios pxe-install,iso-offline-install,pxe-offline-install --output-dir tmp/kola-testiso-metal") - } finally { - shwrap("tar -cf - tmp/kola-testiso-metal/ | xz -c9 > ${env.WORKSPACE}/kola-testiso-metal.tar.xz") - archiveArtifacts allowEmptyArchive: true, artifacts: 'kola-testiso*.tar.xz' - } - }, kola: { - fcosKola(cosaDir: "${env.WORKSPACE}") - } - } + fcosKola(cosaDir: "${env.WORKSPACE}") + fcosKolaTestIso(cosaDir: "${env.WORKSPACE}", skipMetal4k: true, skipMultipath: true) } } |