diff options
| author | Stuart Monteith <stuart.monteith@linaro.org> | 2018-10-03 12:52:51 +0100 |
|---|---|---|
| committer | Stuart Monteith <stuart.monteith@linaro.org> | 2018-10-03 12:00:04 +0000 |
| commit | 2ea36ec5e7d3450f981d2e67ed3b6a7fc9c26799 (patch) | |
| tree | cf3456df074496c87fc480ad66f64f0cb831bc53 /jdkX-build-image.yaml | |
| parent | 9db618590cafe3ba8623fc477a39ce42e6eb14d7 (diff) | |
jdk: Fixup clean job and cd error.
bash 4.4 doesn't allow cd to be passed >1 path. This causes failures as
the bootjdk files (jdk*/ and jdk*.tar.xz) both match.
This patch deletes jdk*.tar.xz to produce a clean path.
Changes release build-release job not to replace cacerts - they are
packaged with JDK from now on anyway.
Moved jdk-clean-job to j12-qrep-01 - not sure how that was missed.
Change-Id: I0bc09d646f65a96ee26ac76b8347ad5e6a9d92e9
Diffstat (limited to 'jdkX-build-image.yaml')
| -rw-r--r-- | jdkX-build-image.yaml | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/jdkX-build-image.yaml b/jdkX-build-image.yaml index a2bc8e3c..a423ff25 100644 --- a/jdkX-build-image.yaml +++ b/jdkX-build-image.yaml @@ -75,9 +75,13 @@ 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.gz + cd ${WORKSPACE}/jdk* export JAVA_HOME=${PWD} |