From ea75761ada2f584e691dbe3d9c51adc95ec146fc Mon Sep 17 00:00:00 2001 From: Stewart X Addison <6487691+sxa@users.noreply.github.com> Date: Wed, 6 Apr 2022 17:37:38 +0100 Subject: [PATCH] Add MacOS/aarch64 builds to JDK11 pipelines (#275) * Add MacOS/aarch64 builds to JDK11 pipelines Signed-off-by: Stewart X Addison * Update pipelines/jobs/configurations/jdk11u_pipeline_config.groovy Co-authored-by: Martijn Verburg Co-authored-by: Martijn Verburg --- pipelines/jobs/configurations/jdk11u.groovy | 1 + .../jobs/configurations/jdk11u_pipeline_config.groovy | 11 +++++++++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/pipelines/jobs/configurations/jdk11u.groovy b/pipelines/jobs/configurations/jdk11u.groovy index b3e61a5f7..d8cdb2e13 100644 --- a/pipelines/jobs/configurations/jdk11u.groovy +++ b/pipelines/jobs/configurations/jdk11u.groovy @@ -8,6 +8,7 @@ targetConfigurations = [ "ppc64leLinux" : [ "temurin", "openj9" ], "s390xLinux" : [ "temurin", "openj9" ], "aarch64Linux" : [ "temurin", "openj9", "dragonwell", "bisheng" ], + "aarch64Mac" : [ "temurin", ], "arm32Linux" : [ "temurin" ], "riscv64Linux" : [ "openj9", "bisheng" ] ] diff --git a/pipelines/jobs/configurations/jdk11u_pipeline_config.groovy b/pipelines/jobs/configurations/jdk11u_pipeline_config.groovy index 87253cb42..75f8221d5 100644 --- a/pipelines/jobs/configurations/jdk11u_pipeline_config.groovy +++ b/pipelines/jobs/configurations/jdk11u_pipeline_config.groovy @@ -40,8 +40,7 @@ class Config11 { os : 'alpine-linux', arch : 'x64', dockerImage : 'adoptopenjdk/alpine3_build_image', - test : 'default', - configureArgs : '--enable-headless-only=yes' + test : 'default' ], x64Windows: [ @@ -114,6 +113,14 @@ class Config11 { ], + aarch64Mac: [ + os : 'mac', + arch : 'aarch64', + additionalNodeLabels: 'macos11', + test : 'default', + configureArgs : '--disable-ccache" + ], + arm32Linux : [ os : 'linux', arch : 'arm',