diff options
author | Fathi Boudra <fathi.boudra@linaro.org> | 2016-04-10 09:52:31 +0300 |
---|---|---|
committer | Fathi Boudra <fathi.boudra@linaro.org> | 2016-04-10 09:52:31 +0300 |
commit | 2c08fc6ba33df102b1ea63c34b17c9d3d787288d (patch) | |
tree | c18cb74b4071421b90202551c7d93c1895f01028 /jdk8-jtreg-test.yaml | |
parent | e253f153ad2e2761f0f985d043fac848f6e3c251 (diff) |
jdk8-jtreg-test: sync with jdk9-jtreg-test
* restrict where the build job is run
* copy jdk from local filesystem
* use our built jdk
* remove the combination filter - unused
Change-Id: I534f8e8a407595cf4b704091e9f71fc725f3e3a0
Signed-off-by: Fathi Boudra <fathi.boudra@linaro.org>
Diffstat (limited to 'jdk8-jtreg-test.yaml')
-rw-r--r-- | jdk8-jtreg-test.yaml | 23 |
1 files changed, 15 insertions, 8 deletions
diff --git a/jdk8-jtreg-test.yaml b/jdk8-jtreg-test.yaml index ef09bbdb8c..f1e14b0ea5 100644 --- a/jdk8-jtreg-test.yaml +++ b/jdk8-jtreg-test.yaml @@ -33,6 +33,11 @@ - hotspot - langtools - jdk + - axis: + type: slave + name: label + values: + - aarch64-06 execution-strategy: sequential: true wrappers: @@ -51,11 +56,13 @@ filter: 'jtreg-build-4.2.0-SNAPSHOT.tar.xz' target: incoming flatten: true - - copyartifact: - project: jdk8-build-image - filter: 'out/jdk8-${JVM_VARIANT}-${BUILD_TYPE}.tar.gz' - target: incoming - flatten: true +# copyartifact is slow and the file is local +# copy instead of going back and forth between master <-> slave +# - copyartifact: +# project: jdk8-build-image +# filter: 'out/jdk8-${JVM_VARIANT}-${BUILD_TYPE}.tar.gz' +# target: incoming +# flatten: true - copyartifact: project: jdk8-update-src-tree filter: 'out/jdk8.tar.gz, out/build-date.sh' @@ -92,7 +99,7 @@ : ${JTREG_SUBCATEGORIES:=.} tar xf incoming/jdk8.tar.gz - tar xf incoming/BUILD_TYPE=${BUILD_TYPE},JVM_VARIANT=${JVM_VARIANT}/jdk8-${JVM_VARIANT}-${BUILD_TYPE}.tar.gz + tar xf ~/workspace/jdk8-build-image/BUILD_TYPE/${BUILD_TYPE}/JVM_VARIANT/${JVM_VARIANT}/label/${NODE_NAME}/out/jdk8-${JVM_VARIANT}-${BUILD_TYPE}.tar.gz tar xf incoming/jtreg-build-4.2.0-SNAPSHOT.tar.xz # All the output directories and general frobbing @@ -134,8 +141,8 @@ cat ${blacklist} echo "---------" - #JAVA_HOME=${WORKSPACE}/jdk8-${JVM_VARIANT}-${BUILD_TYPE} - #PATH=$JAVA_HOME/bin:${PATH} + export JAVA_HOME=${WORKSPACE}/jdk8-${JVM_VARIANT}-${BUILD_TYPE} + export PATH=$JAVA_HOME/bin:${PATH} PATH=${WORKSPACE}/jtreg/linux/bin:${PATH} which java |