jdk: Update jdk9 jobs to build for jdk9u

jdk9 is finished. Changes are now to be built for jdk9u.

Change-Id: I8a37e699a29553d8d61ba85862a8a630914bd75c

26 files changed, 103 insertions, 103 deletions

diff --git a/jdk9-archive-test-scripts.yaml b/jdk9-archive-test-scripts.yaml
index 9f81dee7c4..111b1145a8 100644
--- a/jdk9-archive-test-scripts.yaml
+++ b/jdk9-archive-test-scripts.yaml
@@ -14,7 +14,7 @@
                 - job-extended-read
     disabled: false
     node: aarch64-06
-    display-name: 'OpenJDK 9 - Archive OpenJDK 9 test scripts'
+    display-name: 'OpenJDK 9u - Archive OpenJDK 9u test scripts'
     wrappers:
         - timestamps
     builders:
diff --git a/jdk9-build-and-test.yaml b/jdk9-build-and-test.yaml
index 6309e3ec46..dc0e978dda 100644
--- a/jdk9-build-and-test.yaml
+++ b/jdk9-build-and-test.yaml
@@ -28,7 +28,7 @@
             default: 'default'
     disabled: false
     node: master
-    display-name: 'OpenJDK 9 - Build jdk images and run tests/benchmarks'
+    display-name: 'OpenJDK 9u - Build jdk images and run tests/benchmarks'
     wrappers:
         - workspace-cleanup:
             dirmatch: false
diff --git a/jdk9-build-image.yaml b/jdk9-build-image.yaml
index d68f3dbd89..72b48ddf73 100644
--- a/jdk9-build-image.yaml
+++ b/jdk9-build-image.yaml
@@ -24,7 +24,7 @@
             default: 'http://openjdk.linaro.org/releases/jdk8u-server-release-1708.tar.xz'
     disabled: false
     node: aarch64-06
-    display-name: 'OpenJDK 9 - Configure and build OpenJDK 9'
+    display-name: 'OpenJDK 9u - Configure and build OpenJDK 9u'
     axes:
         - axis:
             type: user-defined
@@ -53,7 +53,7 @@
     builders:
         - copyartifact:
             project: jdk9-update-src-tree
-            filter: 'out/jdk9.tar.gz'
+            filter: 'out/jdk9u.tar.gz'
             target: incoming
             flatten: true
         - copyartifact:
@@ -89,7 +89,7 @@
             cd ${WORKSPACE}
 
             # Extract sources from upstream job
-            tar xf incoming/jdk9.tar.gz
+            tar xf incoming/jdk9u.tar.gz
 
             shopt -s nullglob
 
@@ -106,17 +106,17 @@
 
             if [ $two_stage_build = 1 ]; then
               pushd build-stage1
-              sh ../jdk9/configure --with-jvm-variants=${JVM_VARIANT} --with-debug-level=${BUILD_TYPE} --with-boot-jdk=${WORKSPACE}/primordial-jdk8 ${ccache_build_opts}
+              sh ../jdk9u/configure --with-jvm-variants=${JVM_VARIANT} --with-debug-level=${BUILD_TYPE} --with-boot-jdk=${WORKSPACE}/primordial-jdk8 ${ccache_build_opts}
               make images build-test-hotspot-jtreg-native build-test-jdk-jtreg-native
               popd
 
               pushd build-stage2
-              sh ../jdk9/configure --with-jvm-variants=${JVM_VARIANT} --with-debug-level=${BUILD_TYPE} --with-boot-jdk=${WORKSPACE}/build-stage1/images/j2sdk-image ${ccache_build_opts}
+              sh ../jdk9u/configure --with-jvm-variants=${JVM_VARIANT} --with-debug-level=${BUILD_TYPE} --with-boot-jdk=${WORKSPACE}/build-stage1/images/j2sdk-image ${ccache_build_opts}
               make images build-test-hotspot-jtreg-native build-test-jdk-jtreg-native
               popd
             else
               pushd build-stage2
-              sh ../jdk9/configure --with-jvm-variants=${JVM_VARIANT} --with-debug-level=${BUILD_TYPE} ${ccache_build_opts}
+              sh ../jdk9u/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
@@ -124,7 +124,7 @@
             # Archive the result
             rm -rf out
             mkdir out
-            artifact_name=jdk9-${JVM_VARIANT}-${BUILD_TYPE}
+            artifact_name=jdk9u-${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/jdk9-build-release.yaml b/jdk9-build-release.yaml
index d20523b023..1b9d3e23d7 100644
--- a/jdk9-build-release.yaml
+++ b/jdk9-build-release.yaml
@@ -24,7 +24,7 @@
             default: 'http://openjdk.linaro.org/releases/jdk8u-server-release-1708.tar.xz'
     disabled: false
     node: aarch64-06
-    display-name: 'OpenJDK 9 - Configure and build OpenJDK 9 Release'
+    display-name: 'OpenJDK 9u - Configure and build OpenJDK 9u Release'
     axes:
         - axis:
             type: user-defined
@@ -52,7 +52,7 @@
     builders:
         - copyartifact:
             project: jdk9-update-src-tree
-            filter: 'out/jdk9.tar.gz'
+            filter: 'out/jdk9u.tar.gz'
             target: incoming
             flatten: true
         - copyartifact:
@@ -73,7 +73,7 @@
             # Generate files names dependent on year/month.
             RELEASE=$(date +%y%m)
             JDKDIR=jdk9-${JVM_VARIANT}-${BUILD_TYPE}-${RELEASE}
-            JDK_SRCDIR=jdk9-src-${RELEASE}
+            JDK_SRCDIR=jdk9u-src-${RELEASE}
 
             ccache_build_opts=--disable-ccache
 
@@ -98,11 +98,11 @@
             mkdir out
 
             # Extract sources from upstream job
-            tar xaf incoming/jdk9.tar.gz
+            tar xaf incoming/jdk9u.tar.gz
 
-            mv jdk9 $JDK_SRCDIR
+            mv jdk9u $JDK_SRCDIR
             # Tar up the source before sullying it with a build.
-            tar --exclude=.hg\* -acf out/jdk9-src-${RELEASE}.tar.xz $JDK_SRCDIR
+            tar --exclude=.hg\* -acf out/jdk9u-src-${RELEASE}.tar.xz $JDK_SRCDIR
 
             mv $JDK_SRCDIR $JDKDIR
             shopt -s nullglob
@@ -142,7 +142,7 @@
             fi
 
             # Archive the result
-            artifact_name=jdk9-${JVM_VARIANT}-${BUILD_TYPE}-${RELEASE}
+            artifact_name=jdk9u-${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/jdk9-email-results.yaml b/jdk9-email-results.yaml
index d57cdfb7d0..fe53b3aded 100644
--- a/jdk9-email-results.yaml
+++ b/jdk9-email-results.yaml
@@ -19,7 +19,7 @@
             artifact-num-to-keep: 5
     disabled: false
     node: master
-    display-name: 'OpenJDK 9 - Send e-mail report'
+    display-name: 'OpenJDK 9u - 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 9 on AArch64'
+            subject: 'JTREG, JCStress, SPECjbb2015 and Hadoop/Terasort results for OpenJDK 9u on AArch64'
             content-type: text
             body: |
                 ${FILE,path="report.txt"}
diff --git a/jdk9-generate-email-report.yaml b/jdk9-generate-email-report.yaml
index 3f7849b2f1..e066187f28 100644
--- a/jdk9-generate-email-report.yaml
+++ b/jdk9-generate-email-report.yaml
@@ -35,7 +35,7 @@
             default: '1015'
     disabled: false
     node: aarch64-06
-    display-name: 'OpenJDK 9 - Generate e-mail report'
+    display-name: 'OpenJDK 9u - 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/openjdk9
+            PERSIST=$HOME/srv/openjdk9u
             export SPECJBB_PRODUCT_HOME=$PERSIST/SPECjbb2015
-            export JDK_VERSION=9
+            export JDK_VERSION=9u
             which jtdiff
 
             TOP_DIR=${PERSIST}/openjdk-jtreg-nightly-tests ${PERSIST}/openjdk-test-scripts/openjdk-test-summary release > ${WORKSPACE}/report.txt
diff --git a/jdk9-jcstress-test-persist-results.yaml b/jdk9-jcstress-test-persist-results.yaml
index 6e61e1d6c9..2c5980c0ee 100644
--- a/jdk9-jcstress-test-persist-results.yaml
+++ b/jdk9-jcstress-test-persist-results.yaml
@@ -27,7 +27,7 @@
             default: 'default'
     disabled: false
     node: aarch64-06
-    display-name: 'OpenJDK 9 - Write jcstress tests results'
+    display-name: 'OpenJDK 9u - Write jcstress tests results'
     axes:
         - axis:
             type: user-defined
@@ -71,7 +71,7 @@
 
             set -exu
 
-            PERSIST=$HOME/srv/openjdk9
+            PERSIST=$HOME/srv/openjdk9u
 
             : ${YEAR:=$(date +%Y)}
             : ${DAY_OF_YEAR:=$(date +%j)}
diff --git a/jdk9-jcstress-test-publish-results.yaml b/jdk9-jcstress-test-publish-results.yaml
index c52e560d18..ab7754e0d7 100644
--- a/jdk9-jcstress-test-publish-results.yaml
+++ b/jdk9-jcstress-test-publish-results.yaml
@@ -25,7 +25,7 @@
             default: ''
     disabled: false
     node: aarch64-06
-    display-name: 'OpenJDK 9 - Publish jcstress report'
+    display-name: 'OpenJDK 9u - Publish jcstress report'
     wrappers:
         - timestamps
         - ssh-agent-credentials:
@@ -37,9 +37,9 @@
             #!/bin/bash
 
 
-            PERSIST=$HOME/srv/openjdk9
+            PERSIST=$HOME/srv/openjdk9u
             SCRIPT_DIR=$PERSIST/jcstress-test-scripts
-            export JDK_VERSION=9
+            export JDK_VERSION=9u
 
             if [ -d $SCRIPT_DIR ]; then
                 (cd $SCRIPT_DIR; git pull)
diff --git a/jdk9-jcstress-test.yaml b/jdk9-jcstress-test.yaml
index c1b635aee7..e6d783bdbc 100644
--- a/jdk9-jcstress-test.yaml
+++ b/jdk9-jcstress-test.yaml
@@ -20,7 +20,7 @@
             artifact-num-to-keep: 5
     disabled: false
     node: aarch64-06
-    display-name: 'OpenJDK 9 - Run jcstress tests'
+    display-name: 'OpenJDK 9u - 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 jdk9*
-            tar xf ~/workspace/jdk9-build-image/BUILD_TYPE/${BUILD_TYPE}/JVM_VARIANT/${REAL_VARIANT}/label/${NODE_NAME}/out/jdk9-${REAL_VARIANT}-${BUILD_TYPE}.tar.gz
-            export JAVA_HOME=${WORKSPACE}/jdk9-${REAL_VARIANT}-${BUILD_TYPE}
+            rm -rf jdk9u*
+            tar xf ~/workspace/jdk9-build-image/BUILD_TYPE/${BUILD_TYPE}/JVM_VARIANT/${REAL_VARIANT}/label/${NODE_NAME}/out/jdk9u-${REAL_VARIANT}-${BUILD_TYPE}.tar.gz
+            export JAVA_HOME=${WORKSPACE}/jdk9u-${REAL_VARIANT}-${BUILD_TYPE}
             export PATH=${JAVA_HOME}/bin:${PATH}
             which java
             java -version
diff --git a/jdk9-jtreg-test-persist-results.yaml b/jdk9-jtreg-test-persist-results.yaml
index e7456925d5..48ee6c9b8a 100644
--- a/jdk9-jtreg-test-persist-results.yaml
+++ b/jdk9-jtreg-test-persist-results.yaml
@@ -3,7 +3,7 @@
     project-type: matrix
     defaults: global
     description: |
-        * Writes the results to $HOME/srv/openjdk9/openjdk-jtreg-nightly-tests.
+        * Writes the results to $HOME/srv/openjdk9u/openjdk-jtreg-nightly-tests.
     properties:
         - authorization:
             linaro:
@@ -26,7 +26,7 @@
             default: 'default'
     disabled: false
     node: aarch64-06
-    display-name: 'OpenJDK 9 - Write jtreg tests results'
+    display-name: 'OpenJDK 9u - Write jtreg tests results'
     axes:
         - axis:
             type: user-defined
@@ -67,7 +67,7 @@
             flatten: true
         - copyartifact:
             project: jdk9-build-image
-            filter: 'out/jdk9-server-${BUILD_TYPE}.tar.gz'
+            filter: 'out/jdk9u-server-${BUILD_TYPE}.tar.gz'
             target: incoming
             flatten: true
         - shell: |
@@ -77,12 +77,12 @@
 
             tree -f .
 
-            PERSIST=$HOME/srv/openjdk9
-            export JDK_VERSION=9
+            PERSIST=$HOME/srv/openjdk9u
+            export JDK_VERSION=9u
 
             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}/jdk9-server-${BUILD_TYPE}.tar.gz
+            image_tarball=${WORKSPACE}/incoming/BUILD_TYPE=${BUILD_TYPE},JVM_VARIANT=server,label=${label}/jdk9u-server-${BUILD_TYPE}.tar.gz
 
             : ${YEAR:=$(date +%Y)}
             : ${DAY_OF_YEAR:=$(date +%j)}
diff --git a/jdk9-jtreg-test-publish-results.yaml b/jdk9-jtreg-test-publish-results.yaml
index d99b05a6fb..ca1aff2d8a 100644
--- a/jdk9-jtreg-test-publish-results.yaml
+++ b/jdk9-jtreg-test-publish-results.yaml
@@ -31,7 +31,7 @@
             default: 'default'
     disabled: false
     node: aarch64-06
-    display-name: 'OpenJDK 9 - Publish jtreg results'
+    display-name: 'OpenJDK 9u - Publish jtreg results'
     wrappers:
         - timestamps
         - ssh-agent-credentials:
@@ -47,9 +47,9 @@
 
             set -ex
 
-            PERSIST=$HOME/srv/openjdk9
+            PERSIST=$HOME/srv/openjdk9u
             SCRIPT_DIR=$PERSIST/openjdk-test-scripts
-            export JDK_VERSION=9
+            export JDK_VERSION=9u
 
             (unset PRIVATE_KEY; env | sort  >$WORKSPACE/env.out)
             tree -fd -L 5 $PERSIST | xz >$WORKSPACE/tree.out.xz
diff --git a/jdk9-jtreg-test.yaml b/jdk9-jtreg-test.yaml
index 86e0db9d9e..0e7c8b81c3 100644
--- a/jdk9-jtreg-test.yaml
+++ b/jdk9-jtreg-test.yaml
@@ -26,7 +26,7 @@
             default: 'default'
     disabled: false
     node: aarch64-06
-    display-name: 'OpenJDK 9 - Run jtreg tests'
+    display-name: 'OpenJDK 9u - Run jtreg tests'
     axes:
         - axis:
             type: user-defined
@@ -78,7 +78,7 @@
 #            flatten: true
         - copyartifact:
             project: jdk9-update-src-tree
-            filter: 'out/jdk9.tar.gz, out/build-date.sh'
+            filter: 'out/jdk9u.tar.gz, out/build-date.sh'
             target: incoming
             flatten: true
         - shell: |
@@ -90,12 +90,12 @@
 
             source incoming/build-date.sh
 
-            export JDK_VERSION=9
+            export JDK_VERSION=9u
             # client variant uses server with -XX:TieredStopAtLevel=1
             # zero is a third possible value.
             REAL_VARIANT=${JVM_VARIANT/client/server}
-            IMAGE_DIR=${WORKSPACE}/jdk9-${REAL_VARIANT}-${BUILD_TYPE}
-            PERSIST=$HOME/srv/openjdk9
+            IMAGE_DIR=${WORKSPACE}/jdk9u-${REAL_VARIANT}-${BUILD_TYPE}
+            PERSIST=$HOME/srv/openjdk9u
 
 
             # Only set =1 for debugging.
@@ -117,10 +117,10 @@
 
             : ${JTREG_SUBCATEGORIES:=.}
 
-            tar xf incoming/jdk9.tar.gz
-            tar xf ~/workspace/jdk9-build-image/BUILD_TYPE/${BUILD_TYPE}/JVM_VARIANT/${REAL_VARIANT}/label/${NODE_NAME}/out/jdk9-${REAL_VARIANT}-${BUILD_TYPE}.tar.gz
+            tar xf incoming/jdk9u.tar.gz
+            tar xf ~/workspace/jdk9-build-image/BUILD_TYPE/${BUILD_TYPE}/JVM_VARIANT/${REAL_VARIANT}/label/${NODE_NAME}/out/jdk9u-${REAL_VARIANT}-${BUILD_TYPE}.tar.gz
             tar xf incoming/jtreg-build-4.2.0-SNAPSHOT.tar.xz
-            tar xf ~/workspace/jdk9-build-image/BUILD_TYPE/${BUILD_TYPE}/JVM_VARIANT/${REAL_VARIANT}/label/${NODE_NAME}/out/jdk9-${REAL_VARIANT}-${BUILD_TYPE}-support.tar.gz
+            tar xf ~/workspace/jdk9-build-image/BUILD_TYPE/${BUILD_TYPE}/JVM_VARIANT/${REAL_VARIANT}/label/${NODE_NAME}/out/jdk9u-${REAL_VARIANT}-${BUILD_TYPE}-support.tar.gz
 
             # All the output directories and general frobbing
             # output is to match the existing layout as expected
@@ -139,7 +139,7 @@
 
             mkdir -p out ${src_dir} ${work_dir} ${report_dir}
 
-            mv jdk9/* ${src_dir}
+            mv jdk9u/* ${src_dir}
 
             blacklist=${WORKSPACE}/excludes.txt
             jdk_problem_list=${src_dir}/${JTREG_CATEGORY}/test/ProblemList.txt
@@ -161,12 +161,12 @@
             cat ${blacklist}
             echo "---------"
 
-            export JAVA_HOME=${WORKSPACE}/jdk9-${REAL_VARIANT}-${BUILD_TYPE}
+            export JAVA_HOME=${WORKSPACE}/jdk9u-${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}/jdk9-${REAL_VARIANT}-${BUILD_TYPE}-support/support/test/${JTREG_CATEGORY}/jtreg/native/lib
+            NATIVEPATH=${WORKSPACE}/jdk9u-${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/jdk9-persist-all-results.yaml b/jdk9-persist-all-results.yaml
index 9d9c118479..9b18dba465 100644
--- a/jdk9-persist-all-results.yaml
+++ b/jdk9-persist-all-results.yaml
@@ -25,7 +25,7 @@
             default: 'default'
     disabled: false
     node: master
-    display-name: 'OpenJDK 9 - Persist all results'
+    display-name: 'OpenJDK 9u - Persist all results'
     wrappers:
         - timestamps
     builders:
diff --git a/jdk9-publish-all-results.yaml b/jdk9-publish-all-results.yaml
index ea73ea85d9..78cebdd8c9 100644
--- a/jdk9-publish-all-results.yaml
+++ b/jdk9-publish-all-results.yaml
@@ -18,7 +18,7 @@
             artifact-num-to-keep: 5
     disabled: false
     node: master
-    display-name: 'OpenJDK 9 - Invoke all the scripts to sync results to openjdk.linaro.org'
+    display-name: 'OpenJDK 9u - Invoke all the scripts to sync results to openjdk.linaro.org'
     parameters:
         - string:
             name: PUBLISH_DEST
diff --git a/jdk9-publish-and-report.yaml b/jdk9-publish-and-report.yaml
index e011f0c19e..20925906bb 100644
--- a/jdk9-publish-and-report.yaml
+++ b/jdk9-publish-and-report.yaml
@@ -26,7 +26,7 @@
             default: 'default'
     disabled: false
     node: master
-    display-name: 'OpenJDK 9 - Publish results and send reports'
+    display-name: 'OpenJDK 9u - Publish results and send reports'
     wrappers:
         - timestamps
 # Replaced by parameters
diff --git a/jdk9-specjbb2013-benchmark-persist-results.yaml b/jdk9-specjbb2013-benchmark-persist-results.yaml
index aa3edbe3db..d44697ca2d 100644
--- a/jdk9-specjbb2013-benchmark-persist-results.yaml
+++ b/jdk9-specjbb2013-benchmark-persist-results.yaml
@@ -16,7 +16,7 @@
             artifact-num-to-keep: 5
     disabled: false
     node: aarch64-06
-    display-name: 'OpenJDK 9 - Write SPECjbb2013 results'
+    display-name: 'OpenJDK 9u - Write SPECjbb2013 results'
     axes:
         - axis:
             type: user-defined
@@ -55,7 +55,7 @@
 
             tree -f .
 
-            PERSIST=$HOME/srv/openjdk9
+            PERSIST=$HOME/srv/openjdk9u
             TOP_DIR=$PERSIST
             mkdir -p $TOP_DIR
 
diff --git a/jdk9-specjbb2013-benchmark-publish-results.yaml b/jdk9-specjbb2013-benchmark-publish-results.yaml
index 484de07d6b..8d03a66b31 100644
--- a/jdk9-specjbb2013-benchmark-publish-results.yaml
+++ b/jdk9-specjbb2013-benchmark-publish-results.yaml
@@ -31,7 +31,7 @@
             default: ''
     disabled: false
     node: aarch64-06
-    display-name: 'OpenJDK 9 - Publish SPECjbb2013 benchmark results'
+    display-name: 'OpenJDK 9u - Publish SPECjbb2013 benchmark results'
     wrappers:
         - timestamps
         - ssh-agent-credentials:
@@ -46,7 +46,7 @@
             #!/bin/bash
 
             set -exu
-            PERSIST=$HOME/srv/openjdk9
+            PERSIST=$HOME/srv/openjdk9u
             export TOP_DIR=$PERSIST
 
             $PERSIST/specjbb-test-scripts/specjbb-publish $PUBLISH_DEST
diff --git a/jdk9-specjbb2013-benchmark.yaml b/jdk9-specjbb2013-benchmark.yaml
index e5034ad676..ce4e8aa7a3 100644
--- a/jdk9-specjbb2013-benchmark.yaml
+++ b/jdk9-specjbb2013-benchmark.yaml
@@ -14,7 +14,7 @@
             artifact-num-to-keep: 5
     disabled: false
     node: aarch64-06
-    display-name: 'OpenJDK 9 - Run SPECjbb2013 benchmark'
+    display-name: 'OpenJDK 9u - Run SPECjbb2013 benchmark'
     axes:
         - axis:
             type: user-defined
@@ -60,8 +60,8 @@
             set -exu
 
             ## Extract jdk
-            tar xf ~/workspace/jdk9-build-image/BUILD_TYPE/${BUILD_TYPE}/JVM_VARIANT/${JVM_VARIANT}/label/${NODE_NAME}/out/jdk9-${JVM_VARIANT}-${BUILD_TYPE}.tar.gz
-            export JAVA_HOME=${WORKSPACE}/jdk9-${JVM_VARIANT}-${BUILD_TYPE}
+            tar xf ~/workspace/jdk9-build-image/BUILD_TYPE/${BUILD_TYPE}/JVM_VARIANT/${JVM_VARIANT}/label/${NODE_NAME}/out/jdk9u-${JVM_VARIANT}-${BUILD_TYPE}.tar.gz
+            export JAVA_HOME=${WORKSPACE}/jdk9u-${JVM_VARIANT}-${BUILD_TYPE}
             export PATH=$JAVA_HOME/bin:$PATH
             which java
             java -version
diff --git a/jdk9-specjbb2015-benchmark-persist-results.yaml b/jdk9-specjbb2015-benchmark-persist-results.yaml
index 9754c3b9c1..3b1fd4a03c 100644
--- a/jdk9-specjbb2015-benchmark-persist-results.yaml
+++ b/jdk9-specjbb2015-benchmark-persist-results.yaml
@@ -3,7 +3,7 @@
     project-type: matrix
     defaults: global
     description: |
-        * Writes the results to $HOME/srv/openjdk9/SPECjbb2015-nightly-runs.<br>
+        * Writes the results to $HOME/srv/openjdk9u/SPECjbb2015-nightly-runs.<br>
         * This job has the client axis <b>disabled</b> until there is enough build/test time available.<br>
           * If the client axis is enabled the heap size for the VM will need to be adjusted using -Xmxm
     properties:
@@ -19,7 +19,7 @@
             artifact-num-to-keep: 5
     disabled: false
     node: aarch64-06
-    display-name: 'OpenJDK 9 - Write SPECjbb2015 results'
+    display-name: 'OpenJDK 9u - Write SPECjbb2015 results'
     axes:
         - axis:
             type: user-defined
@@ -58,7 +58,7 @@
 
             tree -f .
 
-            PERSIST=$HOME/srv/openjdk9
+            PERSIST=$HOME/srv/openjdk9u
             TOP_DIR=$PERSIST
             export SPECJBB_PRODUCT_HOME=$PERSIST/SPECjbb2015
             mkdir -p $TOP_DIR
diff --git a/jdk9-specjbb2015-benchmark-publish-results.yaml b/jdk9-specjbb2015-benchmark-publish-results.yaml
index c3d5e66263..b81eee986e 100644
--- a/jdk9-specjbb2015-benchmark-publish-results.yaml
+++ b/jdk9-specjbb2015-benchmark-publish-results.yaml
@@ -3,7 +3,7 @@
     project-type: freestyle
     defaults: global
     description: |
-        * Reports are published to http://openjdk.linaro.org/jdk9/SPECjbb2015-results/
+        * Reports are published to http://openjdk.linaro.org/jdk9u/SPECjbb2015-results/
     properties:
         - authorization:
             anonymous:
@@ -34,7 +34,7 @@
             default: ''
     disabled: false
     node: aarch64-06
-    display-name: 'OpenJDK 9 - Publish SPECjbb2015 benchmark results'
+    display-name: 'OpenJDK 9u - Publish SPECjbb2015 benchmark results'
     wrappers:
         - timestamps
         - ssh-agent-credentials:
@@ -49,7 +49,7 @@
             #!/bin/bash
 
             set -exu
-            PERSIST=$HOME/srv/openjdk9
+            PERSIST=$HOME/srv/openjdk9u
             export TOP_DIR=$PERSIST
             export SPECJBB_PRODUCT_HOME=$PERSIST/SPECjbb2015
 
diff --git a/jdk9-specjbb2015-benchmark.yaml b/jdk9-specjbb2015-benchmark.yaml
index 2d380fe14a..c5442ed3c4 100644
--- a/jdk9-specjbb2015-benchmark.yaml
+++ b/jdk9-specjbb2015-benchmark.yaml
@@ -17,7 +17,7 @@
             artifact-num-to-keep: 5
     disabled: false
     node: aarch64-06
-    display-name: 'OpenJDK 9 - Run SPECjbb2015 benchmark'
+    display-name: 'OpenJDK 9u - Run SPECjbb2015 benchmark'
     axes:
         - axis:
             type: user-defined
@@ -66,8 +66,8 @@
             REAL_VARIANT=${JVM_VARIANT/client/server}
 
             ## Extract jdk
-            tar xf ~/workspace/jdk9-build-image/BUILD_TYPE/${BUILD_TYPE}/JVM_VARIANT/${REAL_VARIANT}/label/${NODE_NAME}/out/jdk9-${REAL_VARIANT}-${BUILD_TYPE}.tar.gz
-            export JAVA_HOME=${WORKSPACE}/jdk9-${REAL_VARIANT}-${BUILD_TYPE}
+            tar xf ~/workspace/jdk9-build-image/BUILD_TYPE/${BUILD_TYPE}/JVM_VARIANT/${REAL_VARIANT}/label/${NODE_NAME}/out/jdk9u-${REAL_VARIANT}-${BUILD_TYPE}.tar.gz
+            export JAVA_HOME=${WORKSPACE}/jdk9u-${REAL_VARIANT}-${BUILD_TYPE}
             export PATH=$JAVA_HOME/bin:$PATH
             which java
             java -version
diff --git a/jdk9-terasort-benchmark-persist-results.yaml b/jdk9-terasort-benchmark-persist-results.yaml
index 415bd1e8c7..eafcc30dc2 100644
--- a/jdk9-terasort-benchmark-persist-results.yaml
+++ b/jdk9-terasort-benchmark-persist-results.yaml
@@ -18,7 +18,7 @@
             artifact-num-to-keep: 5
     disabled: false
     node: aarch64-06
-    display-name: 'OpenJDK 9 - Write terasort results'
+    display-name: 'OpenJDK 9u - Write terasort results'
     axes:
         - axis:
             type: user-defined
@@ -55,7 +55,7 @@
 
             set -exu
 
-            PERSIST=$HOME/srv/openjdk9
+            PERSIST=$HOME/srv/openjdk9u
             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/jdk9-terasort-benchmark-publish-results.yaml b/jdk9-terasort-benchmark-publish-results.yaml
index 24e9cc7924..3a3144019c 100644
--- a/jdk9-terasort-benchmark-publish-results.yaml
+++ b/jdk9-terasort-benchmark-publish-results.yaml
@@ -34,7 +34,7 @@
             default: ''
     disabled: false
     node: aarch64-06
-    display-name: 'OpenJDK 9 - Publish terasort benchmark results'
+    display-name: 'OpenJDK 9u - Publish terasort benchmark results'
     wrappers:
         - workspace-cleanup:
             dirmatch: false
@@ -49,8 +49,8 @@
     builders:
         - shell: |
             #!/bin/bash
-            PERSIST=$HOME/srv/openjdk9
-            export JDK_VERSION=9
+            PERSIST=$HOME/srv/openjdk9u
+            export JDK_VERSION=9u
 
             export BENCHMARK_RESULTS_DIR=$PERSIST/hadoop-terasort-benchmark-results
             SCRIPT_DIR=$PERSIST/hadoop-test-scripts
diff --git a/jdk9-terasort-benchmark.yaml b/jdk9-terasort-benchmark.yaml
index d5cbcb7c2d..fa0a46037b 100644
--- a/jdk9-terasort-benchmark.yaml
+++ b/jdk9-terasort-benchmark.yaml
@@ -18,7 +18,7 @@
             artifact-num-to-keep: 5
     disabled: false
     node: aarch64-06
-    display-name: 'OpenJDK 9 - Run terasort benchmark'
+    display-name: 'OpenJDK 9u - Run terasort benchmark'
     axes:
         - axis:
             type: user-defined
@@ -69,10 +69,10 @@
             REAL_VARIANT=${JVM_VARIANT/client/server}
 
             ## Extract jdk
-            rm -rf jdk9*
-            tar xf ~/workspace/jdk9-build-image/BUILD_TYPE/${BUILD_TYPE}/JVM_VARIANT/${REAL_VARIANT}/label/${NODE_NAME}/out/jdk9-${REAL_VARIANT}-${BUILD_TYPE}.tar.gz
+            rm -rf jdk9u*
+            tar xf ~/workspace/jdk9-build-image/BUILD_TYPE/${BUILD_TYPE}/JVM_VARIANT/${REAL_VARIANT}/label/${NODE_NAME}/out/jdk9u-${REAL_VARIANT}-${BUILD_TYPE}.tar.gz
 
-            export JAVA_HOME=${WORKSPACE}/jdk9-${REAL_VARIANT}-${BUILD_TYPE}
+            export JAVA_HOME=${WORKSPACE}/jdk9u-${REAL_VARIANT}-${BUILD_TYPE}
             export PATH=${JAVA_HOME}/bin:$PATH
 
             ## Extract Hadoop pre-builts
diff --git a/jdk9-update-src-tree-persist.yaml b/jdk9-update-src-tree-persist.yaml
index 30d80b4596..066bb6e5ca 100644
--- a/jdk9-update-src-tree-persist.yaml
+++ b/jdk9-update-src-tree-persist.yaml
@@ -26,7 +26,7 @@
             default: 'default'
     disabled: false
     node: aarch64-06
-    display-name: 'OpenJDK 9 - Write jdk9 source tree'
+    display-name: 'OpenJDK 9u - Write jdk9 source tree'
     wrappers:
         - workspace-cleanup:
             dirmatch: false
@@ -44,13 +44,13 @@
 
             : ${YEAR:=$(date +%Y)}
             : ${DAY_OF_YEAR:=$(date +%j)}
-            PERSIST=$HOME/srv/openjdk9
+            PERSIST=$HOME/srv/openjdk9u
 
             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/jdk9.tar.gz
+            tar -C $src_dir --strip-components=1 -xf $WORKSPACE/incoming/jdk9u.tar.gz
 
             # Copy bill-of-materials to persistent area for email report.
             cp incoming/BOM $TOP_DIR
diff --git a/jdk9-update-src-tree.yaml b/jdk9-update-src-tree.yaml
index 4aa3e69f86..47b1dea0cb 100644
--- a/jdk9-update-src-tree.yaml
+++ b/jdk9-update-src-tree.yaml
@@ -1,59 +1,59 @@
 - scm:
-    name: jdk9
+    name: jdk9u
     scm:
         - hg:
-            url: http://hg.openjdk.java.net/jdk9/dev
+            url: http://hg.openjdk.java.net/jdk-updates/jdk9u
             clean: true
-            subdir: jdk9
+            subdir: jdk9u
 - scm:
     name: corba
     scm:
         - hg:
-            url: http://hg.openjdk.java.net/jdk9/dev/corba
+            url: http://hg.openjdk.java.net/jdk-updates/jdk9u/corba
             clean: true
-            subdir: jdk9/corba
+            subdir: jdk9u/corba
 - scm:
     name: hotspot
     scm:
         - hg:
-            url: http://hg.openjdk.java.net/jdk9/dev/hotspot
+            url: http://hg.openjdk.java.net/jdk-updates/jdk9u/hotspot
             clean: true
-            subdir: jdk9/hotspot
+            subdir: jdk9u/hotspot
 - scm:
     name: jaxp
     scm:
         - hg:
-            url: http://hg.openjdk.java.net/jdk9/dev/jaxp
+            url: http://hg.openjdk.java.net/jdk-updates/jdk9u/jaxp
             clean: true
-            subdir: jdk9/jaxp
+            subdir: jdk9u/jaxp
 - scm:
     name: jaxws
     scm:
         - hg:
-            url: http://hg.openjdk.java.net/jdk9/dev/jaxws
+            url: http://hg.openjdk.java.net/jdk-updates/jdk9u/jaxws
             clean: true
-            subdir: jdk9/jaxws
+            subdir: jdk9u/jaxws
 - scm:
     name: jdk
     scm:
         - hg:
-            url: http://hg.openjdk.java.net/jdk9/dev/jdk
+            url: http://hg.openjdk.java.net/jdk-updates/jdk9u/jdk
             clean: true
-            subdir: jdk9/jdk
+            subdir: jdk9u/jdk
 - scm:
     name: langtools
     scm:
         - hg:
-            url: http://hg.openjdk.java.net/jdk9/dev/langtools
+            url: http://hg.openjdk.java.net/jdk-updates/jdk9u/langtools
             clean: true
-            subdir: jdk9/langtools
+            subdir: jdk9u/langtools
 - scm:
     name: nashorn
     scm:
         - hg:
-            url: http://hg.openjdk.java.net/jdk9/dev/nashorn
+            url: http://hg.openjdk.java.net/jdk-updates/jdk9u/nashorn
             clean: true
-            subdir: jdk9/nashorn
+            subdir: jdk9u/nashorn
 - job:
     name: jdk9-update-src-tree
     project-type: freestyle
@@ -78,9 +78,9 @@
             artifact-num-to-keep: 5
     disabled: false
     node: aarch64-06
-    display-name: 'OpenJDK 9 - Update jdk9 source tree'
+    display-name: 'OpenJDK 9u - Update jdk9 source tree'
     scm:
-        - jdk9
+        - jdk9u
         - corba
         - hotspot
         - jaxp
@@ -101,7 +101,7 @@
             rm -rf out
             mkdir out
 
-            pushd jdk9
+            pushd jdk9u
             #find . -name BOM -exec rm {} \;
             #commit_id=$(hg identify | awk '{print $1}')
             #echo "jdk9-${commit_id}" | tee -a BOM
@@ -139,10 +139,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/jdk9.tar.gz jdk9
+            tar --exclude=.hg -acf out/jdk9u.tar.gz jdk9u
     publishers:
         - archive:
-            artifacts: 'out/jdk9.tar.gz, out/build-date.sh, out/BOM'
+            artifacts: 'out/jdk9u.tar.gz, out/build-date.sh, out/BOM'
         - fingerprint:
             files: 'out/*'
             record-artifacts: true