From b7a1cbc775dc70d4ea49f17a971eb5ee85a7e46f Mon Sep 17 00:00:00 2001
From: Stewart X Addison <6487691+sxa@users.noreply.github.com>
Date: Wed, 8 Mar 2023 15:13:52 +0000
Subject: [PATCH] Use rhel7_build_image for Linux/s390x builds (#642)

Signed-off-by: Stewart X Addison <sxa@redhat.com>
---
 pipelines/jobs/configurations/jdk11u_pipeline_config.groovy | 1 +
 pipelines/jobs/configurations/jdk17u_pipeline_config.groovy | 1 +
 pipelines/jobs/configurations/jdk20_pipeline_config.groovy  | 1 +
 pipelines/jobs/configurations/jdk21_pipeline_config.groovy  | 1 +
 pipelines/jobs/configurations/jdk8u_pipeline_config.groovy  | 1 +
 5 files changed, 5 insertions(+)

diff --git a/pipelines/jobs/configurations/jdk11u_pipeline_config.groovy b/pipelines/jobs/configurations/jdk11u_pipeline_config.groovy
index 5ad00f2e1..c3042d5b8 100644
--- a/pipelines/jobs/configurations/jdk11u_pipeline_config.groovy
+++ b/pipelines/jobs/configurations/jdk11u_pipeline_config.groovy
@@ -103,6 +103,7 @@ class Config11 {
         s390xLinux    : [
                 os                  : 'linux',
                 arch                : 's390x',
+                dockerImage         : 'rhel7_build_image',
                 test                : 'default',
                 configureArgs       : '--enable-dtrace=auto',
                 buildArgs           : [
diff --git a/pipelines/jobs/configurations/jdk17u_pipeline_config.groovy b/pipelines/jobs/configurations/jdk17u_pipeline_config.groovy
index ba43cd536..9b610f9cb 100644
--- a/pipelines/jobs/configurations/jdk17u_pipeline_config.groovy
+++ b/pipelines/jobs/configurations/jdk17u_pipeline_config.groovy
@@ -97,6 +97,7 @@ class Config17 {
         s390xLinux    : [
                 os                  : 'linux',
                 arch                : 's390x',
+                dockerImage         : 'rhel7_build_image',
                 test                : 'default',
                 configureArgs       : '--enable-dtrace',
                 buildArgs           : [
diff --git a/pipelines/jobs/configurations/jdk20_pipeline_config.groovy b/pipelines/jobs/configurations/jdk20_pipeline_config.groovy
index 459dc681a..067e66ff3 100644
--- a/pipelines/jobs/configurations/jdk20_pipeline_config.groovy
+++ b/pipelines/jobs/configurations/jdk20_pipeline_config.groovy
@@ -87,6 +87,7 @@ class Config20 {
         s390xLinux    : [
                 os                  : 'linux',
                 arch                : 's390x',
+                dockerImage         : 'rhel7_build_image',
                 test                : 'default',
                 configureArgs       : '--enable-dtrace',
                 buildArgs           : [
diff --git a/pipelines/jobs/configurations/jdk21_pipeline_config.groovy b/pipelines/jobs/configurations/jdk21_pipeline_config.groovy
index 51a44aac6..36f660068 100644
--- a/pipelines/jobs/configurations/jdk21_pipeline_config.groovy
+++ b/pipelines/jobs/configurations/jdk21_pipeline_config.groovy
@@ -87,6 +87,7 @@ class Config21 {
         s390xLinux    : [
                 os                  : 'linux',
                 arch                : 's390x',
+                dockerImage         : 'rhel7_build_image',
                 test                : 'default',
                 configureArgs       : '--enable-dtrace',
                 buildArgs           : [
diff --git a/pipelines/jobs/configurations/jdk8u_pipeline_config.groovy b/pipelines/jobs/configurations/jdk8u_pipeline_config.groovy
index 3bfd6b2fd..3760aee2e 100644
--- a/pipelines/jobs/configurations/jdk8u_pipeline_config.groovy
+++ b/pipelines/jobs/configurations/jdk8u_pipeline_config.groovy
@@ -96,6 +96,7 @@ class Config8 {
                         temurin: ['sanity.openjdk'],
                         openj9: 'default'
                 ],
+                dockerImage         : 'rhel7_build_image',
                 buildArgs           : [
                         'temurin'   : '--create-sbom'
                 ]