From c2c9c977310ad134257549533eeb3161b6f30078 Mon Sep 17 00:00:00 2001 From: smlambert Date: Thu, 24 May 2018 19:34:02 -0400 Subject: [PATCH] Add arm64 jdk10 to pipeline, add Win testing to release pipelines Signed-off-by: smlambert --- pipelines/openjdk10_nightly_pipeline.groovy | 3 ++- .../openjdk8_openj9_release_pipeline.groovy | 11 +++++------ pipelines/openjdk8_release_pipeline.groovy | 16 ++++++++-------- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/pipelines/openjdk10_nightly_pipeline.groovy b/pipelines/openjdk10_nightly_pipeline.groovy index cd8b59680..90d87393c 100644 --- a/pipelines/openjdk10_nightly_pipeline.groovy +++ b/pipelines/openjdk10_nightly_pipeline.groovy @@ -1,6 +1,6 @@ println "building ${JDK_VERSION}" -def buildPlatforms = ['Mac', 'Windows', 'Linux', 'zLinux', 'ppc64le', 'AIX'] +def buildPlatforms = ['Mac', 'Windows', 'Linux', 'zLinux', 'ppc64le', 'AIX', 'arm64'] def buildMaps = [:] buildMaps['Mac'] = [test:['openjdktest', 'systemtest'], ArchOSs:'x86-64_macos'] buildMaps['Windows'] = [test:['openjdktest'], ArchOSs:'x86-64_windows'] @@ -8,6 +8,7 @@ buildMaps['Linux'] = [test:['openjdktest', 'systemtest', 'externaltest'], ArchOS buildMaps['zLinux'] = [test:['openjdktest', 'systemtest'], ArchOSs:'s390x_linux'] buildMaps['ppc64le'] = [test:['openjdktest', 'systemtest'], ArchOSs:'ppc64le_linux'] buildMaps['AIX'] = [test:false, ArchOSs:'ppc64_aix'] +buildMaps['arm64'] = [test:['openjdktest'], ArchOSs:'arm64_linux'] def jobs = [:] for ( int i = 0; i < buildPlatforms.size(); i++ ) { diff --git a/pipelines/openjdk8_openj9_release_pipeline.groovy b/pipelines/openjdk8_openj9_release_pipeline.groovy index 3416a3330..62ab3094a 100644 --- a/pipelines/openjdk8_openj9_release_pipeline.groovy +++ b/pipelines/openjdk8_openj9_release_pipeline.groovy @@ -2,12 +2,11 @@ println "building ${JDK_VERSION}" def buildPlatforms = ['Linux', 'zLinux', 'ppc64le', 'AIX', 'Windows'] def buildMaps = [:] -buildMaps['Linux'] = [test:true, ArchOSs:'x86-64_linux'] -buildMaps['zLinux'] = [test:true, ArchOSs:'s390x_linux'] -buildMaps['ppc64le'] = [test:true, ArchOSs:'ppc64le_linux'] +buildMaps['Linux'] = [test:['openjdktest', 'systemtest'], ArchOSs:'x86-64_linux'] +buildMaps['zLinux'] = [test:['openjdktest', 'systemtest'], ArchOSs:'s390x_linux'] +buildMaps['ppc64le'] = [test:['openjdktest', 'systemtest'], ArchOSs:'ppc64le_linux'] buildMaps['AIX'] = [test:false, ArchOSs:'ppc64_aix'] -buildMaps['Windows'] = [test:false, ArchOSs:'x86-64_windows'] -def typeTests = ['openjdktest', 'systemtest'] +buildMaps['Windows'] = [test:['openjdktest'], ArchOSs:'x86-64_windows'] def jobs = [:] for ( int i = 0; i < buildPlatforms.size(); i++ ) { @@ -21,7 +20,7 @@ for ( int i = 0; i < buildPlatforms.size(); i++ ) { } if (buildMaps[platform].test) { stage('test') { - typeTests.each { + buildMaps[platform].test.each { build job:"openjdk8_j9_${it}_${archOS}", propagate: false, parameters: [string(name: 'UPSTREAM_JOB_NUMBER', value: "${buildJob.getNumber()}"), diff --git a/pipelines/openjdk8_release_pipeline.groovy b/pipelines/openjdk8_release_pipeline.groovy index 969f8e2e0..e41f5f7f1 100644 --- a/pipelines/openjdk8_release_pipeline.groovy +++ b/pipelines/openjdk8_release_pipeline.groovy @@ -1,14 +1,14 @@ println "building ${JDK_VERSION}" -def buildPlatforms = ['Mac', 'Windows', 'Linux', 'zLinux', 'ppc64le', 'AIX'] +def buildPlatforms = ['Mac', 'Windows', 'Linux', 'zLinux', 'ppc64le', 'AIX', 'arm64'] def buildMaps = [:] -buildMaps['Mac'] = [test:true, ArchOSs:'x86-64_macos'] -buildMaps['Windows'] = [test:false, ArchOSs:'x86-64_windows'] -buildMaps['Linux'] = [test:true, ArchOSs:'x86-64_linux'] -buildMaps['zLinux'] = [test:true, ArchOSs:'s390x_linux'] -buildMaps['ppc64le'] = [test:true, ArchOSs:'ppc64le_linux'] +buildMaps['Mac'] = [test:['openjdktest', 'systemtest'], ArchOSs:'x86-64_macos'] +buildMaps['Windows'] = [test:['openjdktest'], ArchOSs:'x86-64_windows'] +buildMaps['Linux'] = [test:['openjdktest', 'systemtest'], ArchOSs:'x86-64_linux'] +buildMaps['zLinux'] = [test:['openjdktest', 'systemtest'], ArchOSs:'s390x_linux'] +buildMaps['ppc64le'] = [test:['openjdktest', 'systemtest'], ArchOSs:'ppc64le_linux'] buildMaps['AIX'] = [test:false, ArchOSs:'ppc64_aix'] -def typeTests = ['openjdktest', 'systemtest'] +buildMaps['arm64'] = [test:['openjdktest'], ArchOSs:'arm64_linux'] def jobs = [:] for ( int i = 0; i < buildPlatforms.size(); i++ ) { @@ -22,7 +22,7 @@ for ( int i = 0; i < buildPlatforms.size(); i++ ) { parameters: [string(name: 'TAG', value: "${JDK_TAG}")] } if (buildMaps[platform].test) { - stage('test') { + buildMaps[platform].test.each { typeTests.each { build job:"openjdk8_hs_${it}_${archOS}", propagate: false,