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.
This commit is contained in:
parent
3bb3546fff
commit
d5129e3766
|
|
@ -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") {
|
stage("FCOS") {
|
||||||
cosaPod(runAsUser: 0, memory: "3072Mi", cpu: "4") {
|
cosaPod(runAsUser: 0, memory: "4608Mi", cpu: "4") {
|
||||||
stage("Build FCOS") {
|
stage("Build FCOS") {
|
||||||
checkout scm
|
checkout scm
|
||||||
unstash 'build'
|
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)
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue