diff options
| author | Stuart Monteith <stuart.monteith@linaro.org> | 2018-10-03 15:59:02 +0100 |
|---|---|---|
| committer | Stuart Monteith <stuart.monteith@linaro.org> | 2018-10-03 15:59:02 +0100 |
| commit | c7155ae6254dee8b77a3f6ec4d7e1de66194d8e2 (patch) | |
| tree | 0608a90c083dab367e752f7e487f4b98792ca08c /jdkX-build-image.yaml | |
| parent | d641a35fdfaebd57f2c6d4c5a431836f01f95e64 (diff) | |
jdk: Build jdkX with pre-downloaded boot jdk
Use boot-jdk from jdk-boot-jdk job.
Change-Id: I012f1bb8119790654d28e6a9a5065b74bc508346
Diffstat (limited to 'jdkX-build-image.yaml')
| -rw-r--r-- | jdkX-build-image.yaml | 16 |
1 files changed, 2 insertions, 14 deletions
diff --git a/jdkX-build-image.yaml b/jdkX-build-image.yaml index dbff98ad..66ed8ac3 100644 --- a/jdkX-build-image.yaml +++ b/jdkX-build-image.yaml @@ -19,10 +19,6 @@ days-to-keep: 30 num-to-keep: 10 artifact-num-to-keep: 5 - parameters: - - string: - name: JDK_URL - default: 'http://openjdk.linaro.org/releases/jdk10-server-release-1804.tar.xz' disabled: false node: j12-qrep-01 display-name: 'OpenJDK JDK - Configure and build OpenJDK JDK' @@ -75,14 +71,7 @@ rm -rf jdk* primordial-jdk* build* - # Download, setup boot JDK for building. - wget --progress=dot -e dotbytes=2M ${JDK_URL} - tar -Jxf jdk*.tar.xz - - # Bash 4.4 doesn't support cd with >1 parameter. - rm jdk*.tar.xz - - cd ${WORKSPACE}/jdk* + cd ${WORKSPACE}/../jdk-boot-jdk/jdk10 export JAVA_HOME=${PWD} export PATH=${JAVA_HOME}/bin:${PATH} @@ -94,8 +83,7 @@ shopt -s nullglob - # Extract boot jdk - # Not used. tar xf incoming/primordial-jdkX.tar.gz + # Configure and build mkdir -p build-stage1 build-stage2 |