enable evaluation builds of 11 and 17 for windows aarch64 (#664)

adoptium · Mar 30, 2023 · 763e756 · 763e756
1 parent 006dc75
commit 763e756
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 11 deletions.
diff --git a/pipelines/jobs/configurations/jdk11u_evaluation.groovy b/pipelines/jobs/configurations/jdk11u_evaluation.groovy
@@ -1,6 +1,8 @@
 // when no target for evaluation, set it to null and disable scheduler below
-targetConfigurations = null
-//[
+targetConfigurations = [
+        'aarch64Windows': [
+                'temurin'
+        ]
         // 'x64Mac'        : [
         //         'openj9'
         // ],
@@ -28,11 +30,8 @@ targetConfigurations = null
         //         'openj9',
         //         'dragonwell',
         //         'bisheng'
-        // ],
-        // 'aarch64Windows': [
-        //         'temurin'
         // ]
-//]
+]
 
 // if set to empty string then it wont get triggered
 triggerSchedule_evaluation = ''

diff --git a/pipelines/jobs/configurations/jdk11u_pipeline_config.groovy b/pipelines/jobs/configurations/jdk11u_pipeline_config.groovy
@@ -214,7 +214,7 @@ class Config11 {
                 arch                : 'aarch64',
                 crossCompile        : 'x64',
                 additionalNodeLabels: 'win2016&&vs2019',
-                test                : false,
+                test                : 'default',
                 buildArgs       : [
                         'temurin'   : '--jvm-variant client,server --create-sbom --cross-compile'
                 ]

diff --git a/pipelines/jobs/configurations/jdk17u_evaluation.groovy b/pipelines/jobs/configurations/jdk17u_evaluation.groovy
@@ -1,10 +1,10 @@
 targetConfigurations = [
         'aarch64AlpineLinux' : [
                 'temurin'
+        ],
+        'aarch64Windows': [
+                'temurin'
         ]
-        // 'aarch64Windows': [
-        //         'temurin'
-        // ],
         // 'x64Mac'      : [
         //         'openj9'
         // ],

diff --git a/pipelines/jobs/configurations/jdk17u_pipeline_config.groovy b/pipelines/jobs/configurations/jdk17u_pipeline_config.groovy
@@ -160,7 +160,7 @@ class Config17 {
                 arch                : 'aarch64',
                 crossCompile        : 'x64',
                 additionalNodeLabels: 'win2016&&vs2019',
-                test                : false,
+                test                : 'default',
                 buildArgs       : [
                         'temurin'   : '--create-jre-image --create-sbom --cross-compile'
                 ]