diff options
| author | Stuart Monteith <stuart.monteith@linaro.org> | 2018-10-15 10:07:04 +0100 |
|---|---|---|
| committer | Stuart Monteith <stuart.monteith@linaro.org> | 2018-10-15 09:25:16 +0000 |
| commit | 920ed8a94fc54f6697dff1d585367c5aefa1cc97 (patch) | |
| tree | abc11e181d8484ead757aafffa82a261f2abb650 /jdk8-jtreg-test.yaml | |
| parent | 8d7826af898c2b152dca81040b5a398a74e63049 (diff) | |
jdk: Synch jdk8 & 11 with jdkX jobs
The new configuration was made to jdkX, now that is tested, make the
same changes for jdk8 and jdk11.
Change-Id: I2664f0e4bb2507b6d2382c59e7cec5b4cf67e2f8
Diffstat (limited to 'jdk8-jtreg-test.yaml')
| -rw-r--r-- | jdk8-jtreg-test.yaml | 27 |
1 files changed, 7 insertions, 20 deletions
diff --git a/jdk8-jtreg-test.yaml b/jdk8-jtreg-test.yaml index a65abc63..5ec1a2d6 100644 --- a/jdk8-jtreg-test.yaml +++ b/jdk8-jtreg-test.yaml @@ -13,6 +13,7 @@ - job-extended-read - job-build - job-cancel + - job-workspace - build-discarder: days-to-keep: 30 num-to-keep: 10 @@ -64,23 +65,6 @@ - matrix-tie-parent: node: j12-qrep-01 builders: - - copyartifact: - project: jtreg-build - filter: 'jtreg-build-4.2.0-SNAPSHOT.tar.xz' - 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/jdk8u-${JVM_VARIANT}-${BUILD_TYPE}.tar.gz' -# target: incoming -# flatten: true - - copyartifact: - project: jdk8-update-src-tree - filter: 'out/jdk8u.tar.gz, out/build-date.sh' - target: incoming - flatten: true - shell: | #!/bin/bash @@ -88,7 +72,9 @@ set -exu - source incoming/build-date.sh + DEPS=$HOME/workspace/jdkX-get-deps + + source $DEPS/build-date.sh export JDK_VERSION=8u # client variant uses server with -XX:TieredStopAtLevel=1 @@ -97,6 +83,7 @@ IMAGE_DIR=${WORKSPACE}/jdk8u-${REAL_VARIANT}-${BUILD_TYPE} PERSIST=$HOME/srv/openjdk8u + JCSTRESS=$DEPS/jcstress.jar # Only set =1 for debugging. use_subcategories=0 @@ -117,9 +104,9 @@ : ${JTREG_SUBCATEGORIES:=.} - tar xf incoming/jdk8u.tar.gz + tar xf $DEPS/jdk8u.tar.gz tar xf ~/workspace/jdk8-build-image/BUILD_TYPE/${BUILD_TYPE}/JVM_VARIANT/${REAL_VARIANT}/label/${NODE_NAME}/out/jdk8u-${REAL_VARIANT}-${BUILD_TYPE}.tar.gz - tar xf incoming/jtreg-build-4.2.0-SNAPSHOT.tar.xz + tar xf $DEPS/jtreg-build-4.2.0-SNAPSHOT.tar.xz # All the output directories and general frobbing # output is to match the existing layout as expected |