diff options
author | Jonathan Lebon <jonathan@jlebon.com> | 2022-10-13 09:14:08 -0400 |
---|---|---|
committer | Jonathan Lebon <jonathan@jlebon.com> | 2022-10-13 09:14:08 -0400 |
commit | d5129e3766dfc4221355e6c19c5ab0ac2def75ce (patch) | |
tree | a9b1e9b5989012c983e73ac68e50c8ac6f977af9 /.cci.jenkinsfile | |
parent | 3bb3546fff84365312b26661d344af8a9de67c82 (diff) | |
download | ostree-d5129e3766dfc4221355e6c19c5ab0ac2def75ce.tar.gz |
ci: Bump memory request, use fcosKolaTestIso
More fallout from https://github.com/coreos/coreos-ci-lib/pull/116. We
need to be more honest about how much memory we need.
While we're here, switch the `kola testiso` invocation to use
`fcosKolaTestIso` instead. This will add coverage for UEFI and UEFI
SecureBoot testing.
Diffstat (limited to '.cci.jenkinsfile')
-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) } } |