diff options
| author | Stuart Monteith <stuart.monteith@linaro.org> | 2018-10-10 10:50:06 +0100 |
|---|---|---|
| committer | Stuart Monteith <stuart.monteith@linaro.org> | 2018-10-10 10:50:06 +0100 |
| commit | 3aec43797d549dbf634472c22edd702f3c6a7c5e (patch) | |
| tree | 75ff1accc6eaabeb9d69e8b8480b2064dff21373 /jdkX-jcstress-test.yaml | |
| parent | c6007e88be89eaf91c00a4b274e4a206b758a3b9 (diff) | |
jdk: Use jdkX-get-deps job for dependencies.
Use jdkX-get-deps location in the workspace for jtregs, jcstress and
source code. This prevents jtreg from downloading them slowly 6 times.
Change-Id: I53520545b608d23d976803c4831f03e460f37a75
Diffstat (limited to 'jdkX-jcstress-test.yaml')
| -rw-r--r-- | jdkX-jcstress-test.yaml | 15 |
1 files changed, 2 insertions, 13 deletions
diff --git a/jdkX-jcstress-test.yaml b/jdkX-jcstress-test.yaml index 38215b90..5d9a8a58 100644 --- a/jdkX-jcstress-test.yaml +++ b/jdkX-jcstress-test.yaml @@ -53,30 +53,19 @@ - timeout: timeout: 900 builders: - - copyartifact: - project: jcstress-build - filter: 'tests-custom/target/jcstress.jar, tests-all/target/jcstress.jar' - target: incoming - flatten: false -# copyartifact is slow and the file is local -# copy instead of going back and forth between master <-> slave -# - copyartifact: -# project: jdkX-build-image -# filter: 'out/jdkX-${JVM_VARIANT}-${BUILD_TYPE}.tar.gz' -# target: incoming -# flatten: true - shell: | #!/bin/bash set -eu TEST_TYPE=all + DEPS=$HOME/workspace/jdkX-get-deps # client variant uses server with -XX:TieredStopAtLevel=1 # zero is a third possible value. REAL_VARIANT=${JVM_VARIANT/client/server} - JCSTRESS_JAR=${WORKSPACE}/incoming/tests-${TEST_TYPE}/target/jcstress.jar + JCSTRESS_JAR=$DEPS/jcstress.jar rm -rf jdkX* tar xf ~/workspace/jdkX-build-image/BUILD_TYPE/${BUILD_TYPE}/JVM_VARIANT/${REAL_VARIANT}/label/${NODE_NAME}/out/jdkX-${REAL_VARIANT}-${BUILD_TYPE}.tar.gz export JAVA_HOME=${WORKSPACE}/jdkX-${REAL_VARIANT}-${BUILD_TYPE} |