Skip to content

Commit 11f2ca6

Browse files
committed
jobs: limit xz memory usage on multi-arch too
We recently hit `xz` on the ppc64le builder getting OOMkilled. Let's match x86_64 and also limit memory in the multi-arch paths too. Except we're using a more conservative value (though still plenty) since there's no resource-based scheduling on these builders. We should probably add support for e.g. `cosa compress --xz-memlimit` instead to make this less awkward.
1 parent f412e64 commit 11f2ca6

File tree

2 files changed

+7
-4
lines changed

2 files changed

+7
-4
lines changed

jobs/build-arch.Jenkinsfile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -335,7 +335,8 @@ lock(resource: "build-${params.STREAM}-${basearch}") {
335335
}
336336

337337
stage('Archive') {
338-
shwrap("cosa compress")
338+
// Limit to 2G to be good neighbours and reduce chances of getting OOMkilled.
339+
// shwrap("cosa shell -- env XZ_DEFAULTS=--memlimit=2G cosa compress")
339340

340341
if (uploading) {
341342
def acl = pipecfg.s3.acl ?: 'public-read'

jobs/bump-lockfile.Jenkinsfile

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -220,9 +220,11 @@ lock(resource: "bump-lockfile") {
220220
}
221221
stage("${arch}:Build Live") {
222222
shwrap("cosa buildextend-live --fast")
223-
// Test metal4k with an uncompressed image and metal with a
224-
// compressed one
225-
shwrap("cosa compress --artifact=metal")
223+
// Test metal4k with an uncompressed image and
224+
// metal with a compressed one. Limit to 2G to be
225+
// good neighbours and reduce chances of getting
226+
// OOMkilled.
227+
shwrap("cosa shell -- env XZ_DEFAULTS=--memlimit=2G cosa compress --artifact=metal")
226228
}
227229
stage("${arch}:kola:testiso") {
228230
kolaTestIso(cosaDir: env.WORKSPACE, arch: arch, marker: arch)

0 commit comments

Comments
 (0)