diff options
| author | Stuart Monteith <stuart.monteith@linaro.org> | 2018-10-11 14:56:11 +0100 |
|---|---|---|
| committer | Stuart Monteith <stuart.monteith@linaro.org> | 2018-10-11 14:57:35 +0100 |
| commit | c73dfff885298da1ce84197ffdf2dfbdc0abb1c4 (patch) | |
| tree | e2b69cdf9c59f7a29e23d772e6da5f3be610fc02 /jdkX-ci-build.yaml | |
| parent | e56e03814d28352c17cda7fd5add9c86160b0b26 (diff) | |
jdk: Make jdk-ci-build job keep source
We can't afford to delete and replace the source each build.
Change-Id: Ibab706a3ccdbc129886f01ab33c6be6cd2bd4fb8
Diffstat (limited to 'jdkX-ci-build.yaml')
| -rw-r--r-- | jdkX-ci-build.yaml | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/jdkX-ci-build.yaml b/jdkX-ci-build.yaml index d7f1e10f..d46779ce 100644 --- a/jdkX-ci-build.yaml +++ b/jdkX-ci-build.yaml @@ -53,7 +53,6 @@ ccache_build_opts=--disable-ccache - rm -rf jdk* primordial-jdk* build* tar xJf jtreg-build-4.2.0-SNAPSHOT.tar.xz cd ${HOME}/workspace/jdk-cache-files2/jdk10 @@ -63,18 +62,16 @@ cd ${WORKSPACE} - # Extract sources from upstream job - tar xf incoming/jdkX.tar.gz - shopt -s nullglob # Configure and build - mkdir -p build-stage1 build-stage2 + rm -rf build + mkdir -p build which java java -version - pushd build-stage2 + pushd build sh ../jdkX/configure --with-debug-level=fastdebug \ ${ccache_build_opts} \ --with-jtreg=${WORKSPACE}/jtreg @@ -86,10 +83,10 @@ rm -rf out mkdir out artifact_name=jdkX-${JVM_VARIANT}-${BUILD_TYPE} - tar -C build-stage2/images/jdk --exclude=\*.diz --transform="s!^./!$artifact_name/!" -acf out/${artifact_name}.tar.gz . + tar -C build/images/jdk --exclude=\*.diz --transform="s!^./!$artifact_name/!" -acf out/${artifact_name}.tar.gz . # Archive test support files. - tar -C build-stage2/ --exclude=hotspot/jtreg/native/support/\* --transform="s!^support/!${artifact_name}-support/support/!" -acf out/${artifact_name}-support.tar.gz support/test + tar -C build/ --exclude=hotspot/jtreg/native/support/\* --transform="s!^support/!${artifact_name}-support/support/!" -acf out/${artifact_name}-support.tar.gz support/test publishers: - archive: artifacts: 'out/*.tar.gz, out/build.out.gz' |