diff options
-rw-r--r-- | jdk10-build-and-test.yaml | 2 | ||||
-rw-r--r-- | jdk10-build-image.yaml | 14 | ||||
-rw-r--r-- | jdk10-build-release.yaml | 16 | ||||
-rw-r--r-- | jdk10-email-results.yaml | 4 | ||||
-rw-r--r-- | jdk10-generate-email-report.yaml | 6 | ||||
-rw-r--r-- | jdk10-jcstress-test-persist-results.yaml | 4 | ||||
-rw-r--r-- | jdk10-jcstress-test-publish-results.yaml | 6 | ||||
-rw-r--r-- | jdk10-jcstress-test.yaml | 8 | ||||
-rw-r--r-- | jdk10-jtreg-test-persist-results.yaml | 10 | ||||
-rw-r--r-- | jdk10-jtreg-test-publish-results.yaml | 6 | ||||
-rw-r--r-- | jdk10-jtreg-test.yaml | 22 | ||||
-rw-r--r-- | jdk10-persist-all-results.yaml | 2 | ||||
-rw-r--r-- | jdk10-publish-all-results.yaml | 2 | ||||
-rw-r--r-- | jdk10-publish-and-report.yaml | 2 | ||||
-rw-r--r-- | jdk10-specjbb2015-benchmark-persist-results.yaml | 4 | ||||
-rw-r--r-- | jdk10-specjbb2015-benchmark-publish-results.yaml | 4 | ||||
-rw-r--r-- | jdk10-specjbb2015-benchmark.yaml | 6 | ||||
-rw-r--r-- | jdk10-terasort-benchmark-persist-results.yaml | 4 | ||||
-rw-r--r-- | jdk10-terasort-benchmark-publish-results.yaml | 6 | ||||
-rw-r--r-- | jdk10-terasort-benchmark.yaml | 8 | ||||
-rw-r--r-- | jdk10-update-src-tree-persist.yaml | 6 | ||||
-rw-r--r-- | jdk10-update-src-tree.yaml | 16 |
22 files changed, 79 insertions, 79 deletions
diff --git a/jdk10-build-and-test.yaml b/jdk10-build-and-test.yaml index d013e11786..8b6cabebb8 100644 --- a/jdk10-build-and-test.yaml +++ b/jdk10-build-and-test.yaml @@ -28,7 +28,7 @@ default: 'default' disabled: false node: master - display-name: 'OpenJDK 10 - Build jdk images and run tests/benchmarks' + display-name: 'OpenJDK 10u - Build jdk images and run tests/benchmarks' wrappers: - workspace-cleanup: dirmatch: false diff --git a/jdk10-build-image.yaml b/jdk10-build-image.yaml index 7761b886f7..54e0afffa6 100644 --- a/jdk10-build-image.yaml +++ b/jdk10-build-image.yaml @@ -25,7 +25,7 @@ default: 'http://openjdk.linaro.org/releases/jdk9-server-release-1708.tar.xz' disabled: false node: aarch64-06 - display-name: 'OpenJDK 10 - Configure and build OpenJDK 10' + display-name: 'OpenJDK 10u - Configure and build OpenJDK 10' axes: - axis: type: user-defined @@ -54,7 +54,7 @@ builders: - copyartifact: project: jdk10-update-src-tree - filter: 'out/jdk10.tar.gz' + filter: 'out/jdk10u.tar.gz' target: incoming flatten: true # - copyartifact: @@ -90,7 +90,7 @@ cd ${WORKSPACE} # Extract sources from upstream job - tar xf incoming/jdk10.tar.gz + tar xf incoming/jdk10u.tar.gz shopt -s nullglob @@ -107,17 +107,17 @@ if [ $two_stage_build = 1 ]; then pushd build-stage1 - sh ../jdk10/configure --with-jvm-variants=${JVM_VARIANT} --with-debug-level=${BUILD_TYPE} --with-boot-jdk=${WORKSPACE}/primordial-jdk10 ${ccache_build_opts} + sh ../jdk10u/configure --with-jvm-variants=${JVM_VARIANT} --with-debug-level=${BUILD_TYPE} --with-boot-jdk=${WORKSPACE}/primordial-jdk10 ${ccache_build_opts} make images build-test-hotspot-jtreg-native build-test-jdk-jtreg-native popd pushd build-stage2 - sh ../jdk10/configure --with-jvm-variants=${JVM_VARIANT} --with-debug-level=${BUILD_TYPE} --with-boot-jdk=${WORKSPACE}/build-stage1/images/jdk ${ccache_build_opts} + sh ../jdk10u/configure --with-jvm-variants=${JVM_VARIANT} --with-debug-level=${BUILD_TYPE} --with-boot-jdk=${WORKSPACE}/build-stage1/images/jdk ${ccache_build_opts} make images build-test-hotspot-jtreg-native build-test-jdk-jtreg-native popd else pushd build-stage2 - sh ../jdk10/configure --with-jvm-variants=${JVM_VARIANT} --with-debug-level=${BUILD_TYPE} ${ccache_build_opts} + sh ../jdk10u/configure --with-jvm-variants=${JVM_VARIANT} --with-debug-level=${BUILD_TYPE} ${ccache_build_opts} make images build-test-hotspot-jtreg-native build-test-jdk-jtreg-native popd fi @@ -125,7 +125,7 @@ # Archive the result rm -rf out mkdir out - artifact_name=jdk10-${JVM_VARIANT}-${BUILD_TYPE} + artifact_name=jdk10u-${JVM_VARIANT}-${BUILD_TYPE} tar -C build-stage2/images/jdk --exclude=\*.diz --transform="s!^./!$artifact_name/!" -acf out/${artifact_name}.tar.gz . # Archive test support files. diff --git a/jdk10-build-release.yaml b/jdk10-build-release.yaml index 0dbaa39769..5805af3e7d 100644 --- a/jdk10-build-release.yaml +++ b/jdk10-build-release.yaml @@ -24,7 +24,7 @@ default: 'http://openjdk.linaro.org/releases/jdk9-server-release-1708.tar.xz' disabled: false node: aarch64-06 - display-name: 'OpenJDK 10 - Configure and build OpenJDK 10 Release' + display-name: 'OpenJDK 10u - Configure and build OpenJDK 10u Release' axes: - axis: type: user-defined @@ -52,7 +52,7 @@ builders: - copyartifact: project: jdk10-update-src-tree - filter: 'out/jdk10.tar.gz' + filter: 'out/jdk10u.tar.gz' target: incoming flatten: true # - copyartifact: @@ -72,8 +72,8 @@ # Generate files names dependent on year/month. RELEASE=$(date +%y%m) - JDKDIR=jdk10-${JVM_VARIANT}-${BUILD_TYPE}-${RELEASE} - JDK_SRCDIR=jdk10-src-${RELEASE} + JDKDIR=jdk10u-${JVM_VARIANT}-${BUILD_TYPE}-${RELEASE} + JDK_SRCDIR=jdk10u-src-${RELEASE} ccache_build_opts=--disable-ccache @@ -98,11 +98,11 @@ mkdir out # Extract sources from upstream job - tar xaf incoming/jdk10.tar.gz + tar xaf incoming/jdk10u.tar.gz - mv jdk10 $JDK_SRCDIR + mv jdk10u $JDK_SRCDIR # Tar up the source before sullying it with a build. - tar --exclude=.hg\* -acf out/jdk10-src-${RELEASE}.tar.xz $JDK_SRCDIR + tar --exclude=.hg\* -acf out/jdk10u-src-${RELEASE}.tar.xz $JDK_SRCDIR mv $JDK_SRCDIR $JDKDIR shopt -s nullglob @@ -142,7 +142,7 @@ fi # Archive the result - artifact_name=jdk10-${JVM_VARIANT}-${BUILD_TYPE}-${RELEASE} + artifact_name=jdk10u-${JVM_VARIANT}-${BUILD_TYPE}-${RELEASE} # This is different from ordinary builds. tar -C build-stage2/images --exclude=\*.diz --transform="s!^jdk!$artifact_name!" -acf out/${artifact_name}.tar.xz jdk diff --git a/jdk10-email-results.yaml b/jdk10-email-results.yaml index c5e0d600a4..c648487550 100644 --- a/jdk10-email-results.yaml +++ b/jdk10-email-results.yaml @@ -19,7 +19,7 @@ artifact-num-to-keep: 5 disabled: false node: master - display-name: 'OpenJDK 10 - Send e-mail report' + display-name: 'OpenJDK 10u - Send e-mail report' wrappers: - timestamps builders: @@ -29,7 +29,7 @@ publishers: - email-ext: recipients: 'stuart.monteith@linaro.org, fathi.boudra@linaro.org, aarch64-port-dev@openjdk.java.net' - subject: 'JTREG, JCStress, SPECjbb2015 and Hadoop/Terasort results for OpenJDK 10 on AArch64' + subject: 'JTREG, JCStress, SPECjbb2015 and Hadoop/Terasort results for OpenJDK 10u on AArch64' content-type: text body: | ${FILE,path="report.txt"} diff --git a/jdk10-generate-email-report.yaml b/jdk10-generate-email-report.yaml index 69189685e5..9882564403 100644 --- a/jdk10-generate-email-report.yaml +++ b/jdk10-generate-email-report.yaml @@ -35,7 +35,7 @@ default: '1015' disabled: false node: aarch64-06 - display-name: 'OpenJDK 10 - Generate e-mail report' + display-name: 'OpenJDK 10u - Generate e-mail report' wrappers: - timestamps # Replaced by parameters @@ -52,9 +52,9 @@ tar xf incoming/jtreg-build-4.2.0-SNAPSHOT.tar.xz PATH=${WORKSPACE}/jtreg/bin:${PATH} - PERSIST=$HOME/srv/openjdk10 + PERSIST=$HOME/srv/openjdk10u export SPECJBB_PRODUCT_HOME=$PERSIST/SPECjbb2015 - export JDK_VERSION=10 + export JDK_VERSION=10u which jtdiff TOP_DIR=${PERSIST}/openjdk-jtreg-nightly-tests ${PERSIST}/openjdk-test-scripts/openjdk-test-summary release > ${WORKSPACE}/report.txt diff --git a/jdk10-jcstress-test-persist-results.yaml b/jdk10-jcstress-test-persist-results.yaml index d7de1b836d..ad9ed7e96e 100644 --- a/jdk10-jcstress-test-persist-results.yaml +++ b/jdk10-jcstress-test-persist-results.yaml @@ -27,7 +27,7 @@ default: 'default' disabled: false node: aarch64-06 - display-name: 'OpenJDK 10 - Write jcstress tests results' + display-name: 'OpenJDK 10u - Write jcstress tests results' axes: - axis: type: user-defined @@ -71,7 +71,7 @@ set -exu - PERSIST=$HOME/srv/openjdk10 + PERSIST=$HOME/srv/openjdk10u : ${YEAR:=$(date +%Y)} : ${DAY_OF_YEAR:=$(date +%j)} diff --git a/jdk10-jcstress-test-publish-results.yaml b/jdk10-jcstress-test-publish-results.yaml index 919603a6d6..c90084513a 100644 --- a/jdk10-jcstress-test-publish-results.yaml +++ b/jdk10-jcstress-test-publish-results.yaml @@ -25,7 +25,7 @@ default: '' disabled: false node: aarch64-06 - display-name: 'OpenJDK 10 - Publish jcstress report' + display-name: 'OpenJDK 10u - Publish jcstress report' wrappers: - timestamps - ssh-agent-credentials: @@ -37,9 +37,9 @@ #!/bin/bash - PERSIST=$HOME/srv/openjdk10 + PERSIST=$HOME/srv/openjdk10u SCRIPT_DIR=$PERSIST/jcstress-test-scripts - export JDK_VERSION=10 + export JDK_VERSION=10u if [ -d $SCRIPT_DIR ]; then (cd $SCRIPT_DIR; git pull) diff --git a/jdk10-jcstress-test.yaml b/jdk10-jcstress-test.yaml index e09cedbda5..dbb994ce35 100644 --- a/jdk10-jcstress-test.yaml +++ b/jdk10-jcstress-test.yaml @@ -20,7 +20,7 @@ artifact-num-to-keep: 5 disabled: false node: aarch64-06 - display-name: 'OpenJDK 10 - Run jcstress tests' + display-name: 'OpenJDK 10u - Run jcstress tests' parameters: - string: name: JCSTRESS_MODE @@ -77,9 +77,9 @@ REAL_VARIANT=${JVM_VARIANT/client/server} JCSTRESS_JAR=${WORKSPACE}/incoming/tests-${TEST_TYPE}/target/jcstress.jar - rm -rf jdk10* - tar xf ~/workspace/jdk10-build-image/BUILD_TYPE/${BUILD_TYPE}/JVM_VARIANT/${REAL_VARIANT}/label/${NODE_NAME}/out/jdk10-${REAL_VARIANT}-${BUILD_TYPE}.tar.gz - export JAVA_HOME=${WORKSPACE}/jdk10-${REAL_VARIANT}-${BUILD_TYPE} + rm -rf jdk10u* + tar xf ~/workspace/jdk10-build-image/BUILD_TYPE/${BUILD_TYPE}/JVM_VARIANT/${REAL_VARIANT}/label/${NODE_NAME}/out/jdk10u-${REAL_VARIANT}-${BUILD_TYPE}.tar.gz + export JAVA_HOME=${WORKSPACE}/jdk10u-${REAL_VARIANT}-${BUILD_TYPE} export PATH=${JAVA_HOME}/bin:${PATH} which java java -version diff --git a/jdk10-jtreg-test-persist-results.yaml b/jdk10-jtreg-test-persist-results.yaml index f3cfb0967d..0c3500f0e0 100644 --- a/jdk10-jtreg-test-persist-results.yaml +++ b/jdk10-jtreg-test-persist-results.yaml @@ -26,7 +26,7 @@ default: 'default' disabled: false node: aarch64-06 - display-name: 'OpenJDK 10 - Write jtreg tests results' + display-name: 'OpenJDK 10u - Write jtreg tests results' axes: - axis: type: user-defined @@ -67,7 +67,7 @@ flatten: true - copyartifact: project: jdk10-build-image - filter: 'out/jdk10-server-${BUILD_TYPE}.tar.gz' + filter: 'out/jdk10u-server-${BUILD_TYPE}.tar.gz' target: incoming flatten: true - shell: | @@ -77,12 +77,12 @@ tree -f . - PERSIST=$HOME/srv/openjdk10 - export JDK_VERSION=10 + PERSIST=$HOME/srv/openjdk10u + export JDK_VERSION=10u result_tarball=${WORKSPACE}/incoming/BUILD_TYPE=${BUILD_TYPE},JTREG_CATEGORY=${JTREG_CATEGORY},JVM_VARIANT=${JVM_VARIANT},label=${label}/jtreg-results-${JTREG_CATEGORY}-${JVM_VARIANT}-${BUILD_TYPE}.tar.gz - image_tarball=${WORKSPACE}/incoming/BUILD_TYPE=${BUILD_TYPE},JVM_VARIANT=server,label=${label}/jdk10-server-${BUILD_TYPE}.tar.gz + image_tarball=${WORKSPACE}/incoming/BUILD_TYPE=${BUILD_TYPE},JVM_VARIANT=server,label=${label}/jdk10u-server-${BUILD_TYPE}.tar.gz : ${YEAR:=$(date +%Y)} : ${DAY_OF_YEAR:=$(date +%j)} diff --git a/jdk10-jtreg-test-publish-results.yaml b/jdk10-jtreg-test-publish-results.yaml index fd4d50144e..a7802630fe 100644 --- a/jdk10-jtreg-test-publish-results.yaml +++ b/jdk10-jtreg-test-publish-results.yaml @@ -31,7 +31,7 @@ default: 'default' disabled: false node: aarch64-06 - display-name: 'OpenJDK 10 - Publish jtreg results' + display-name: 'OpenJDK 10u - Publish jtreg results' wrappers: - timestamps - ssh-agent-credentials: @@ -47,9 +47,9 @@ set -ex - PERSIST=$HOME/srv/openjdk10 + PERSIST=$HOME/srv/openjdk10u SCRIPT_DIR=$PERSIST/openjdk-test-scripts - export JDK_VERSION=10 + export JDK_VERSION=10u (unset PRIVATE_KEY; env | sort >$WORKSPACE/env.out) tree -fd -L 5 $PERSIST | xz >$WORKSPACE/tree.out.xz diff --git a/jdk10-jtreg-test.yaml b/jdk10-jtreg-test.yaml index 779d6e218d..6e0152e78f 100644 --- a/jdk10-jtreg-test.yaml +++ b/jdk10-jtreg-test.yaml @@ -26,7 +26,7 @@ default: 'default' disabled: false node: aarch64-06 - display-name: 'OpenJDK 10 - Run jtreg tests' + display-name: 'OpenJDK 10u - Run jtreg tests' axes: - axis: type: user-defined @@ -78,7 +78,7 @@ # flatten: true - copyartifact: project: jdk10-update-src-tree - filter: 'out/jdk10.tar.gz, out/build-date.sh' + filter: 'out/jdk10u.tar.gz, out/build-date.sh' target: incoming flatten: true - copyartifact: @@ -95,19 +95,19 @@ source incoming/build-date.sh - export JDK_VERSION=10 + export JDK_VERSION=10u # client variant uses server with -XX:TieredStopAtLevel=1 # zero is a third possible value. REAL_VARIANT=${JVM_VARIANT/client/server} - IMAGE_DIR=${WORKSPACE}/jdk10-${REAL_VARIANT}-${BUILD_TYPE} - PERSIST=$HOME/srv/openjdk10 + IMAGE_DIR=${WORKSPACE}/jdk10u-${REAL_VARIANT}-${BUILD_TYPE} + PERSIST=$HOME/srv/openjdk10u JCSTRESS=$PWD/incoming/jcstress.jar - tar xf incoming/jdk10.tar.gz - tar xf ~/workspace/jdk10-build-image/BUILD_TYPE/${BUILD_TYPE}/JVM_VARIANT/${REAL_VARIANT}/label/${NODE_NAME}/out/jdk10-${REAL_VARIANT}-${BUILD_TYPE}.tar.gz + tar xf incoming/jdk10u.tar.gz + tar xf ~/workspace/jdk10-build-image/BUILD_TYPE/${BUILD_TYPE}/JVM_VARIANT/${REAL_VARIANT}/label/${NODE_NAME}/out/jdk10u-${REAL_VARIANT}-${BUILD_TYPE}.tar.gz tar xf incoming/jtreg-build-4.2.0-SNAPSHOT.tar.xz - tar xf ~/workspace/jdk10-build-image/BUILD_TYPE/${BUILD_TYPE}/JVM_VARIANT/${REAL_VARIANT}/label/${NODE_NAME}/out/jdk10-${REAL_VARIANT}-${BUILD_TYPE}-support.tar.gz + tar xf ~/workspace/jdk10-build-image/BUILD_TYPE/${BUILD_TYPE}/JVM_VARIANT/${REAL_VARIANT}/label/${NODE_NAME}/out/jdk10u-${REAL_VARIANT}-${BUILD_TYPE}-support.tar.gz # All the output directories and general frobbing # output is to match the existing layout as expected @@ -126,7 +126,7 @@ mkdir -p out ${src_dir} ${work_dir} ${report_dir} - mv jdk10/* ${src_dir} + mv jdk10u/* ${src_dir} blacklist=${WORKSPACE}/excludes.txt jdk_problem_list=${src_dir}/${JTREG_CATEGORY}/test/ProblemList.txt @@ -148,12 +148,12 @@ cat ${blacklist} echo "---------" - export JAVA_HOME=${WORKSPACE}/jdk10-${REAL_VARIANT}-${BUILD_TYPE} + export JAVA_HOME=${WORKSPACE}/jdk10u-${REAL_VARIANT}-${BUILD_TYPE} export PATH=$JAVA_HOME/bin:${PATH} # For hotspot and jdk we pass a -nativepath: option to jtreg. # This enables the tests needing native libraries to run. - NATIVEPATH=${WORKSPACE}/jdk10-${REAL_VARIANT}-${BUILD_TYPE}-support/support/test/${JTREG_CATEGORY}/jtreg/native/lib + NATIVEPATH=${WORKSPACE}/jdk10u-${REAL_VARIANT}-${BUILD_TYPE}-support/support/test/${JTREG_CATEGORY}/jtreg/native/lib if [ $JTREG_CATEGORY = "langtools" ]; then # The nativepath option we pass must be a valid directory, or diff --git a/jdk10-persist-all-results.yaml b/jdk10-persist-all-results.yaml index 64444e7ca0..5f4aa0ea16 100644 --- a/jdk10-persist-all-results.yaml +++ b/jdk10-persist-all-results.yaml @@ -25,7 +25,7 @@ default: 'default' disabled: false node: master - display-name: 'OpenJDK 10 - Persist all results' + display-name: 'OpenJDK 10u - Persist all results' wrappers: - timestamps builders: diff --git a/jdk10-publish-all-results.yaml b/jdk10-publish-all-results.yaml index 47cf06bdd2..0ce497d26e 100644 --- a/jdk10-publish-all-results.yaml +++ b/jdk10-publish-all-results.yaml @@ -18,7 +18,7 @@ artifact-num-to-keep: 5 disabled: false node: master - display-name: 'OpenJDK 10 - Invoke all the scripts to sync results to openjdk.linaro.org' + display-name: 'OpenJDK 10u - Invoke all the scripts to sync results to openjdk.linaro.org' parameters: - string: name: PUBLISH_DEST diff --git a/jdk10-publish-and-report.yaml b/jdk10-publish-and-report.yaml index cc428e260a..a3f753da5b 100644 --- a/jdk10-publish-and-report.yaml +++ b/jdk10-publish-and-report.yaml @@ -26,7 +26,7 @@ default: 'default' disabled: false node: master - display-name: 'OpenJDK 10 - Publish results and send reports' + display-name: 'OpenJDK 10u - Publish results and send reports' wrappers: - timestamps # Replaced by parameters diff --git a/jdk10-specjbb2015-benchmark-persist-results.yaml b/jdk10-specjbb2015-benchmark-persist-results.yaml index dd7ccdd21b..84f2225904 100644 --- a/jdk10-specjbb2015-benchmark-persist-results.yaml +++ b/jdk10-specjbb2015-benchmark-persist-results.yaml @@ -19,7 +19,7 @@ artifact-num-to-keep: 5 disabled: false node: aarch64-06 - display-name: 'OpenJDK 10 - Write SPECjbb2015 results' + display-name: 'OpenJDK 10u - Write SPECjbb2015 results' axes: - axis: type: user-defined @@ -58,7 +58,7 @@ tree -f . - PERSIST=$HOME/srv/openjdk10 + PERSIST=$HOME/srv/openjdk10u TOP_DIR=$PERSIST export SPECJBB_PRODUCT_HOME=$PERSIST/SPECjbb2015 mkdir -p $TOP_DIR diff --git a/jdk10-specjbb2015-benchmark-publish-results.yaml b/jdk10-specjbb2015-benchmark-publish-results.yaml index a78785745e..c2bbd27a2e 100644 --- a/jdk10-specjbb2015-benchmark-publish-results.yaml +++ b/jdk10-specjbb2015-benchmark-publish-results.yaml @@ -34,7 +34,7 @@ default: '' disabled: false node: aarch64-06 - display-name: 'OpenJDK 10 - Publish SPECjbb2015 benchmark results' + display-name: 'OpenJDK 10u - Publish SPECjbb2015 benchmark results' wrappers: - timestamps - ssh-agent-credentials: @@ -49,7 +49,7 @@ #!/bin/bash set -exu - PERSIST=$HOME/srv/openjdk10 + PERSIST=$HOME/srv/openjdk10u export TOP_DIR=$PERSIST export SPECJBB_PRODUCT_HOME=$PERSIST/SPECjbb2015 diff --git a/jdk10-specjbb2015-benchmark.yaml b/jdk10-specjbb2015-benchmark.yaml index 1be838fbd6..16f38e83c5 100644 --- a/jdk10-specjbb2015-benchmark.yaml +++ b/jdk10-specjbb2015-benchmark.yaml @@ -17,7 +17,7 @@ artifact-num-to-keep: 5 disabled: false node: aarch64-06 - display-name: 'OpenJDK 10 - Run SPECjbb2015 benchmark' + display-name: 'OpenJDK 10u - Run SPECjbb2015 benchmark' axes: - axis: type: user-defined @@ -66,8 +66,8 @@ REAL_VARIANT=${JVM_VARIANT/client/server} ## Extract jdk - tar xf ~/workspace/jdk10-build-image/BUILD_TYPE/${BUILD_TYPE}/JVM_VARIANT/${REAL_VARIANT}/label/${NODE_NAME}/out/jdk10-${REAL_VARIANT}-${BUILD_TYPE}.tar.gz - export JAVA_HOME=${WORKSPACE}/jdk10-${REAL_VARIANT}-${BUILD_TYPE} + tar xf ~/workspace/jdk10u-build-image/BUILD_TYPE/${BUILD_TYPE}/JVM_VARIANT/${REAL_VARIANT}/label/${NODE_NAME}/out/jdk10u-${REAL_VARIANT}-${BUILD_TYPE}.tar.gz + export JAVA_HOME=${WORKSPACE}/jdk10u-${REAL_VARIANT}-${BUILD_TYPE} export PATH=$JAVA_HOME/bin:$PATH which java java -version diff --git a/jdk10-terasort-benchmark-persist-results.yaml b/jdk10-terasort-benchmark-persist-results.yaml index 628c4ba93f..bb046f874b 100644 --- a/jdk10-terasort-benchmark-persist-results.yaml +++ b/jdk10-terasort-benchmark-persist-results.yaml @@ -18,7 +18,7 @@ artifact-num-to-keep: 5 disabled: false node: aarch64-06 - display-name: 'OpenJDK 10 - Write terasort results' + display-name: 'OpenJDK 10u - Write terasort results' axes: - axis: type: user-defined @@ -55,7 +55,7 @@ set -exu - PERSIST=$HOME/srv/openjdk10 + PERSIST=$HOME/srv/openjdk10u export BENCHMARK_RESULTS_DIR=$PERSIST/hadoop-terasort-benchmark-results new_results=incoming/BUILD_TYPE=${BUILD_TYPE},JVM_VARIANT=${JVM_VARIANT},label=${label}/*.csv prev_results=$BENCHMARK_RESULTS_DIR/results.csv diff --git a/jdk10-terasort-benchmark-publish-results.yaml b/jdk10-terasort-benchmark-publish-results.yaml index 683e320e75..784136d673 100644 --- a/jdk10-terasort-benchmark-publish-results.yaml +++ b/jdk10-terasort-benchmark-publish-results.yaml @@ -34,7 +34,7 @@ default: '' disabled: false node: aarch64-06 - display-name: 'OpenJDK 10 - Publish terasort benchmark results' + display-name: 'OpenJDK 10u - Publish terasort benchmark results' wrappers: - workspace-cleanup: dirmatch: false @@ -49,8 +49,8 @@ builders: - shell: | #!/bin/bash - PERSIST=$HOME/srv/openjdk10 - export JDK_VERSION=10 + PERSIST=$HOME/srv/openjdk10u + export JDK_VERSION=10u export BENCHMARK_RESULTS_DIR=$PERSIST/hadoop-terasort-benchmark-results SCRIPT_DIR=$PERSIST/hadoop-test-scripts diff --git a/jdk10-terasort-benchmark.yaml b/jdk10-terasort-benchmark.yaml index 92a0594dca..ca76e91238 100644 --- a/jdk10-terasort-benchmark.yaml +++ b/jdk10-terasort-benchmark.yaml @@ -18,7 +18,7 @@ artifact-num-to-keep: 5 disabled: false node: aarch64-06 - display-name: 'OpenJDK 10 - Run terasort benchmark' + display-name: 'OpenJDK 10u - Run terasort benchmark' axes: - axis: type: user-defined @@ -69,10 +69,10 @@ REAL_VARIANT=${JVM_VARIANT/client/server} ## Extract jdk - rm -rf jdk10* - tar xf ~/workspace/jdk10-build-image/BUILD_TYPE/${BUILD_TYPE}/JVM_VARIANT/${REAL_VARIANT}/label/${NODE_NAME}/out/jdk10-${REAL_VARIANT}-${BUILD_TYPE}.tar.gz + rm -rf jdk10u* + tar xf ~/workspace/jdk10u-build-image/BUILD_TYPE/${BUILD_TYPE}/JVM_VARIANT/${REAL_VARIANT}/label/${NODE_NAME}/out/jdk10u-${REAL_VARIANT}-${BUILD_TYPE}.tar.gz - export JAVA_HOME=${WORKSPACE}/jdk10-${REAL_VARIANT}-${BUILD_TYPE} + export JAVA_HOME=${WORKSPACE}/jdk10u-${REAL_VARIANT}-${BUILD_TYPE} export PATH=${JAVA_HOME}/bin:$PATH ## Extract Hadoop pre-builts diff --git a/jdk10-update-src-tree-persist.yaml b/jdk10-update-src-tree-persist.yaml index e59b8cdd1a..3cc443961c 100644 --- a/jdk10-update-src-tree-persist.yaml +++ b/jdk10-update-src-tree-persist.yaml @@ -26,7 +26,7 @@ default: 'default' disabled: false node: aarch64-06 - display-name: 'OpenJDK 10 - Write jdk10 source tree' + display-name: 'OpenJDK 10u - Write jdk10 source tree' wrappers: - workspace-cleanup: dirmatch: false @@ -44,13 +44,13 @@ : ${YEAR:=$(date +%Y)} : ${DAY_OF_YEAR:=$(date +%j)} - PERSIST=$HOME/srv/openjdk10 + PERSIST=$HOME/srv/openjdk10u TOP_DIR=$PERSIST/openjdk-jtreg-nightly-tests src_dir=$TOP_DIR/src/$YEAR/$DAY_OF_YEAR mkdir -p $src_dir echo "Extracting tarball to $src_dir" - tar -C $src_dir --strip-components=1 -xf $WORKSPACE/incoming/jdk10.tar.gz + tar -C $src_dir --strip-components=1 -xf $WORKSPACE/incoming/jdk10u.tar.gz # Copy bill-of-materials to persistent area for email report. cp incoming/BOM $TOP_DIR diff --git a/jdk10-update-src-tree.yaml b/jdk10-update-src-tree.yaml index 54a724798e..c2f70fb2f6 100644 --- a/jdk10-update-src-tree.yaml +++ b/jdk10-update-src-tree.yaml @@ -1,10 +1,10 @@ - scm: - name: jdk10 + name: jdk10u scm: - hg: - url: http://hg.openjdk.java.net/jdk/jdk10 + url: http://hg.openjdk.java.net/jdk-updates/jdk10u clean: true - subdir: jdk10 + subdir: jdk10u - job: name: jdk10-update-src-tree project-type: freestyle @@ -29,9 +29,9 @@ artifact-num-to-keep: 5 disabled: false node: aarch64-06 - display-name: 'OpenJDK 10 - Update jdk10 source tree' + display-name: 'OpenJDK 10u - Update jdk10u source tree' scm: - - jdk10 + - jdk10u triggers: - pollscm: 'H 2 1-6/2 * *' wrappers: @@ -45,7 +45,7 @@ rm -rf out mkdir out - pushd jdk10 + pushd jdk10u #find . -name BOM -exec rm {} \; #commit_id=$(hg identify | awk '{print $1}') #echo "jdk10-${commit_id}" | tee -a BOM @@ -79,10 +79,10 @@ echo "export YEAR=${YEAR}" > out/build-date.sh echo "export DAY_OF_YEAR=${DAY_OF_YEAR}" >> out/build-date.sh - tar --exclude=.hg -acf out/jdk10.tar.gz jdk10 + tar --exclude=.hg -acf out/jdk10u.tar.gz jdk10u publishers: - archive: - artifacts: 'out/jdk10.tar.gz, out/build-date.sh, out/BOM' + artifacts: 'out/jdk10u.tar.gz, out/build-date.sh, out/BOM' - fingerprint: files: 'out/*' record-artifacts: true |