From 56d29564ddb4ccc92e6dc0c5933e77191a5e6794 Mon Sep 17 00:00:00 2001 From: lanxia Date: Tue, 17 Jul 2018 15:45:10 -0400 Subject: [PATCH] Update node label Signed-off-by: lanxia --- buildenv/jenkins/openjdk10_ppc64_aix | 2 +- buildenv/jenkins/openjdk10_s390x_linux | 2 +- buildenv/jenkins/openjdk8_ppc64_aix | 2 +- buildenv/jenkins/openjdk8_s390x_linux | 2 +- buildenv/jenkins/openjdk9_ppc64_aix | 2 +- buildenv/jenkins/openjdk9_s390x_linux | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/buildenv/jenkins/openjdk10_ppc64_aix b/buildenv/jenkins/openjdk10_ppc64_aix index 2cc9daa832..1727bba97c 100644 --- 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 index 09ee286dd4..dfda9b7695 100644 --- 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 index 8c7947f4a4..7131320b60 100644 --- 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 index 51c8adb59d..9123aad9ba 100644 --- 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 index 58d7cb7768..41eac1b456 100644 --- 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 index b4a1663f01..87e5dc9685 100644 --- 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