From 68a3ad417ece5191c904d3fcd441b92662161592 Mon Sep 17 00:00:00 2001
From: Dusty Mabe <dusty@dustymabe.com>
Date: Fri, 22 Jul 2022 11:37:21 -0400
Subject: [PATCH] jobs/{build,build-arch}: don't run metal4k tests on s390x

The 4k disk doesn't work right now. See
https://github.com/coreos/fedora-coreos-tracker/issues/1261

Also rework a bit the structure of the "parallel" invocation
for testiso.
---
 jobs/build-arch.Jenkinsfile | 15 +++++++++++----
 jobs/build.Jenkinsfile      | 11 ++++++++---
 2 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/jobs/build-arch.Jenkinsfile b/jobs/build-arch.Jenkinsfile
index 7cad061aa..4c8667620 100644
--- a/jobs/build-arch.Jenkinsfile
+++ b/jobs/build-arch.Jenkinsfile
@@ -482,17 +482,24 @@ lock(resource: "build-${params.STREAM}-${params.ARCH}", extra: [[resource: "rele
                 cosa compress --compressor xz --artifact metal --artifact metal4k
                 """)
                 try {
-                    parallel metal: {
+                    parallelruns = [:]
+                    parallelruns['metal'] = {
                         shwrap("cosa kola testiso -S --output-dir tmp/kola-testiso-metal")
-                    }, metal4k: {
-                        shwrap("cosa kola testiso -SP --qemu-native-4k --qemu-multipath --output-dir tmp/kola-testiso-metal4k")
                     }
+                    // metal4k doesn't work on s390x right now: https://github.com/coreos/fedora-coreos-tracker/issues/1261
+                    if (basearch != "s390x") {
+                        parallelruns['metal4k'] = {
+                            shwrap("cosa kola testiso -SP --qemu-native-4k --qemu-multipath --output-dir tmp/kola-testiso-metal4k")
+                        }
+                    }
+                    // process this batch
+                    parallel parallelruns
                 } catch (Throwable e) {
                     throw e
                 } finally {
                     shwrap("""
                     cosa shell -- tar -c --xz tmp/kola-testiso-metal/ > kola-testiso-metal.tar.xz
-                    cosa shell -- tar -c --xz tmp/kola-testiso-metal4k/ > kola-testiso-metal4k.tar.xz
+                    cosa shell -- tar -c --xz tmp/kola-testiso-metal4k/ > kola-testiso-metal4k.tar.xz || :
                     """)
                     archiveArtifacts allowEmptyArchive: true, artifacts: 'kola-testiso*.tar.xz'
                 }
diff --git a/jobs/build.Jenkinsfile b/jobs/build.Jenkinsfile
index c1f0471f0..28f274784 100644
--- a/jobs/build.Jenkinsfile
+++ b/jobs/build.Jenkinsfile
@@ -468,11 +468,14 @@ lock(resource: "build-${params.STREAM}") {
                 cosa compress --compressor xz --artifact metal --artifact metal4k
                 """)
                 try {
-                    parallel metal: {
+                    parallelruns = [:]
+                    parallelruns['metal'] = {
                         shwrap("cosa kola testiso -S --output-dir tmp/kola-testiso-metal")
-                    }, metal4k: {
+                    }
+                    parallelruns['metal4k'] = {
                         shwrap("cosa kola testiso -SP --qemu-native-4k --qemu-multipath --output-dir tmp/kola-testiso-metal4k")
-                    }, uefi: {
+                    }
+                    parallelruns['uefi'] = {
                         shwrap("cosa shell -- mkdir -p tmp/kola-testiso-uefi")
                         shwrap("""
                         cosa shell -- mkdir tmp/iso-live-login-with-rd-debug
@@ -483,6 +486,8 @@ lock(resource: "build-${params.STREAM}") {
                         shwrap("cosa kola testiso -S --qemu-firmware=uefi --scenarios iso-live-login,iso-as-disk --output-dir tmp/kola-testiso-uefi/insecure")
                         shwrap("cosa kola testiso -S --qemu-firmware=uefi-secure --scenarios iso-live-login,iso-as-disk --output-dir tmp/kola-testiso-uefi/secure")
                     }
+                    // process this batch
+                    parallel parallelruns
                 } catch (Throwable e) {
                     throw e
                 } finally {