Update node label (#481)

Signed-off-by: lanxia <lan_xia@ca.ibm.com>
adoptium · Jul 18, 2018 · ec5bdc4 · ec5bdc4
1 parent 8dc8d70
commit ec5bdc4
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 6 deletions.
diff --git a/buildenv/jenkins/openjdk10_ppc64_aix b/buildenv/jenkins/openjdk10_ppc64_aix
@@ -3,7 +3,7 @@
 	Set parameter TARGET(openjdk, system, external, perf, jck etc.).
 	Set UPSTREAM_JOB_NAME(version_build_arch_os, for example: openjdk8_build_x86-64_linux)
 	Set JVM_VERSION(openjdk8, openjdk8-openj9, openjdk9, openjdk8-openj9, etc.*/
-LABEL='aix&&ppc64&&test||ci.project.openj9&&hw.arch.ppc&&sw.os.aix7.1'
+LABEL='hw.arch.ppc&&sw.os.aix'
 
 node ("master") {
 	checkout scm

diff --git a/buildenv/jenkins/openjdk10_s390x_linux b/buildenv/jenkins/openjdk10_s390x_linux
@@ -3,7 +3,7 @@
 	Set parameter TARGET(openjdk, system, external, perf, jck etc.).
 	Set UPSTREAM_JOB_NAME(version_build_arch_os, for example: openjdk8_build_x86-64_linux)
 	Set JVM_VERSION(openjdk8, openjdk8-openj9, openjdk9, openjdk8-openj9, etc.*/
-LABEL='sw.os.linux&&hw.arch.s390'
+LABEL='sw.os.linux&&hw.arch.s390x'
 
 node ("master") {
 	checkout scm

diff --git a/buildenv/jenkins/openjdk8_ppc64_aix b/buildenv/jenkins/openjdk8_ppc64_aix
@@ -3,7 +3,7 @@
 	Set parameter TARGET(openjdk, system, external, perf, jck etc.).
 	Set UPSTREAM_JOB_NAME(version_build_arch_os, for example: openjdk8_build_x86-64_linux)
 	Set JVM_VERSION(openjdk8, openjdk8-openj9, openjdk9, openjdk8-openj9, etc.*/
-LABEL='aix&&ppc64&&test||ci.project.openj9&&hw.arch.ppc&&sw.os.aix7.1'
+LABEL='hw.arch.ppc&&sw.os.aix'
 
 node ("master") {
 	checkout scm

diff --git a/buildenv/jenkins/openjdk8_s390x_linux b/buildenv/jenkins/openjdk8_s390x_linux
@@ -3,7 +3,7 @@
 	Set parameter TARGET(openjdk, system, external, perf, jck etc.).
 	Set UPSTREAM_JOB_NAME(version_build_arch_os, for example: openjdk8_build_x86-64_linux)
 	Set JVM_VERSION(openjdk8, openjdk8-openj9, openjdk9, openjdk8-openj9, etc.*/
-LABEL='sw.os.linux&&hw.arch.s390'
+LABEL='sw.os.linux&&hw.arch.s390x'
 
 node ("master") {
 	checkout scm

diff --git a/buildenv/jenkins/openjdk9_ppc64_aix b/buildenv/jenkins/openjdk9_ppc64_aix
@@ -3,7 +3,7 @@
 	Set parameter TARGET(openjdk, system, external, perf, jck etc.).
 	Set UPSTREAM_JOB_NAME(version_build_arch_os, for example: openjdk8_build_x86-64_linux)
 	Set JVM_VERSION(openjdk8, openjdk8-openj9, openjdk9, openjdk8-openj9, etc.*/
-LABEL='aix&&ppc64&&test||ci.project.openj9&&hw.arch.ppc&&sw.os.aix7.1'
+LABEL='hw.arch.ppc&&sw.os.aix'
 
 node ("master") {
 	checkout scm

diff --git a/buildenv/jenkins/openjdk9_s390x_linux b/buildenv/jenkins/openjdk9_s390x_linux
@@ -3,7 +3,7 @@
 	Set parameter TARGET(openjdk, system, external, perf, jck etc.).
 	Set UPSTREAM_JOB_NAME(version_build_arch_os, for example: openjdk8_build_x86-64_linux)
 	Set JVM_VERSION(openjdk8, openjdk8-openj9, openjdk9, openjdk8-openj9, etc.*/
-LABEL='sw.os.linux&&hw.arch.s390'
+LABEL='sw.os.linux&&hw.arch.s390x'
 
 node ("master") {
 	checkout scm