diff options
Diffstat (limited to 'jdk10-build-image.yaml')
-rw-r--r-- | jdk10-build-image.yaml | 14 |
1 files changed, 7 insertions, 7 deletions
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. |