diff options
| author | Fathi Boudra <fathi.boudra@linaro.org> | 2016-04-10 09:59:46 +0300 |
|---|---|---|
| committer | Fathi Boudra <fathi.boudra@linaro.org> | 2016-04-10 09:59:46 +0300 |
| commit | 6c316b236b5c5b0c488fc4820f25576b538e9f9a (patch) | |
| tree | 51bdf0719f0e9576b09557e85d88ac1e75253dcc /jdk8-jcstress-test.yaml | |
| parent | 2c08fc6ba33df102b1ea63c34b17c9d3d787288d (diff) | |
jdk8-jcstress-test: sync with jdk9-jcstress-test
* restrict where the build job is run
* get rid of combination filter comment
* don't flatten jcstress-build artifacts
* copy jdk from local filesystem
Change-Id: If1d3b6aa20b8dd3faa809e79c1e2116f7f91e61c
Signed-off-by: Fathi Boudra <fathi.boudra@linaro.org>
Diffstat (limited to 'jdk8-jcstress-test.yaml')
| -rw-r--r-- | jdk8-jcstress-test.yaml | 23 |
1 files changed, 14 insertions, 9 deletions
diff --git a/jdk8-jcstress-test.yaml b/jdk8-jcstress-test.yaml index d850aee1..6ccd4b7a 100644 --- a/jdk8-jcstress-test.yaml +++ b/jdk8-jcstress-test.yaml @@ -28,9 +28,12 @@ name: BUILD_TYPE values: - release + - axis: + type: slave + name: label + values: + - aarch64-06 execution-strategy: -# combination-filter: | -# JVM_VARIANT=="server" sequential: true wrappers: - workspace-cleanup: @@ -45,12 +48,14 @@ project: jcstress-build filter: 'tests-custom/target/jcstress.jar, tests-all/target/jcstress.jar' target: incoming - flatten: true - - copyartifact: - project: jdk8-build-image - filter: 'out/jdk8-${JVM_VARIANT}-${BUILD_TYPE}.tar.gz' - target: incoming - flatten: true + flatten: false +# 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 - shell: | #!/bin/bash @@ -61,7 +66,7 @@ JCSTRESS_JAR=${WORKSPACE}/incoming/tests-${TEST_TYPE}/target/jcstress.jar rm -rf jdk8* - 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 export JAVA_HOME=${WORKSPACE}/jdk8-${JVM_VARIANT}-${BUILD_TYPE} export PATH=${JAVA_HOME}/bin:${PATH} which java |