From bcf1d803c808d2dcdbd8cd29a0bf4889408e9acb Mon Sep 17 00:00:00 2001
From: Haroon Khel <hkhel@redhat.com>
Date: Tue, 10 Oct 2023 16:12:06 +0100
Subject: [PATCH 1/2] update x64 mac build jobs to use macos11 label

---
 pipelines/jobs/configurations/jdk11u_pipeline_config.groovy | 2 +-
 pipelines/jobs/configurations/jdk17u_pipeline_config.groovy | 2 +-
 pipelines/jobs/configurations/jdk20u_pipeline_config.groovy | 2 +-
 pipelines/jobs/configurations/jdk21u_pipeline_config.groovy | 2 +-
 pipelines/jobs/configurations/jdk22_pipeline_config.groovy  | 2 +-
 pipelines/jobs/configurations/jdk8u_pipeline_config.groovy  | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/pipelines/jobs/configurations/jdk11u_pipeline_config.groovy b/pipelines/jobs/configurations/jdk11u_pipeline_config.groovy
index 26f763e3c..f81096445 100644
--- a/pipelines/jobs/configurations/jdk11u_pipeline_config.groovy
+++ b/pipelines/jobs/configurations/jdk11u_pipeline_config.groovy
@@ -4,7 +4,7 @@ class Config11 {
         x64Mac    : [
                 os                  : 'mac',
                 arch                : 'x64',
-                additionalNodeLabels : 'macos10.14',
+                additionalNodeLabels : 'macos11',
                 test                : 'default',
                 configureArgs       : [
                         'openj9'      : '--enable-dtrace=auto --with-cmake',
diff --git a/pipelines/jobs/configurations/jdk17u_pipeline_config.groovy b/pipelines/jobs/configurations/jdk17u_pipeline_config.groovy
index 28c0a517a..dc3a9a238 100644
--- a/pipelines/jobs/configurations/jdk17u_pipeline_config.groovy
+++ b/pipelines/jobs/configurations/jdk17u_pipeline_config.groovy
@@ -4,7 +4,7 @@ class Config17 {
         x64Mac    : [
                 os                  : 'mac',
                 arch                : 'x64',
-                additionalNodeLabels: 'macos10.14',
+                additionalNodeLabels: 'macos11',
                 additionalTestLabels: [
                         openj9      : '!sw.os.osx.10_11'
                 ],
diff --git a/pipelines/jobs/configurations/jdk20u_pipeline_config.groovy b/pipelines/jobs/configurations/jdk20u_pipeline_config.groovy
index 7da7f59a9..5729de8f7 100644
--- a/pipelines/jobs/configurations/jdk20u_pipeline_config.groovy
+++ b/pipelines/jobs/configurations/jdk20u_pipeline_config.groovy
@@ -4,7 +4,7 @@ class Config20 {
         x64Mac    : [
                 os                  : 'mac',
                 arch                : 'x64',
-                additionalNodeLabels: 'macos10.14',
+                additionalNodeLabels: 'macos',
                 additionalTestLabels: [
                         openj9      : '!sw.os.osx.10_11'
                 ],
diff --git a/pipelines/jobs/configurations/jdk21u_pipeline_config.groovy b/pipelines/jobs/configurations/jdk21u_pipeline_config.groovy
index 0463a7e72..0a046d158 100644
--- a/pipelines/jobs/configurations/jdk21u_pipeline_config.groovy
+++ b/pipelines/jobs/configurations/jdk21u_pipeline_config.groovy
@@ -4,7 +4,7 @@ class Config21 {
         x64Mac    : [
                 os                  : 'mac',
                 arch                : 'x64',
-                additionalNodeLabels: 'macos10.14',
+                additionalNodeLabels: 'macos11',
                 additionalTestLabels: [
                         openj9      : '!sw.os.osx.10_11'
                 ],
diff --git a/pipelines/jobs/configurations/jdk22_pipeline_config.groovy b/pipelines/jobs/configurations/jdk22_pipeline_config.groovy
index 1c142fe5b..106527bcd 100644
--- a/pipelines/jobs/configurations/jdk22_pipeline_config.groovy
+++ b/pipelines/jobs/configurations/jdk22_pipeline_config.groovy
@@ -4,7 +4,7 @@ class Config22 {
         x64Mac    : [
                 os                  : 'mac',
                 arch                : 'x64',
-                additionalNodeLabels: 'macos10.14',
+                additionalNodeLabels: 'macos11',
                 additionalTestLabels: [
                         openj9      : '!sw.os.osx.10_11'
                 ],
diff --git a/pipelines/jobs/configurations/jdk8u_pipeline_config.groovy b/pipelines/jobs/configurations/jdk8u_pipeline_config.groovy
index 669e24c04..1e39af7b8 100644
--- a/pipelines/jobs/configurations/jdk8u_pipeline_config.groovy
+++ b/pipelines/jobs/configurations/jdk8u_pipeline_config.groovy
@@ -5,7 +5,7 @@ class Config8 {
                 os                  : 'mac',
                 arch                : 'x64',
                 additionalNodeLabels: [
-                        temurin : 'macos10.14',
+                        temurin : 'macos11',
                         corretto: 'build-macstadium-macos1010-1',
                         openj9  : 'macos10.14'
                 ],

From 633cb3dd440b6b0d69301e91dd258d764cb0073a Mon Sep 17 00:00:00 2001
From: Haroon Khel <hkhel@redhat.com>
Date: Tue, 10 Oct 2023 16:16:40 +0100
Subject: [PATCH 2/2] typo

---
 pipelines/jobs/configurations/jdk20u_pipeline_config.groovy | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pipelines/jobs/configurations/jdk20u_pipeline_config.groovy b/pipelines/jobs/configurations/jdk20u_pipeline_config.groovy
index 5729de8f7..312c2fe2a 100644
--- a/pipelines/jobs/configurations/jdk20u_pipeline_config.groovy
+++ b/pipelines/jobs/configurations/jdk20u_pipeline_config.groovy
@@ -4,7 +4,7 @@ class Config20 {
         x64Mac    : [
                 os                  : 'mac',
                 arch                : 'x64',
-                additionalNodeLabels: 'macos',
+                additionalNodeLabels: 'macos11',
                 additionalTestLabels: [
                         openj9      : '!sw.os.osx.10_11'
                 ],