diff options
| author | Stuart Monteith <stuart.monteith@linaro.org> | 2018-10-16 16:25:21 +0100 |
|---|---|---|
| committer | Stuart Monteith <stuart.monteith@linaro.org> | 2018-10-18 15:07:12 +0100 |
| commit | 087485e32c5b98cf938634ef7f6b047594dab4fe (patch) | |
| tree | 863d82d8b0263e279fbb54bafb032b7be5e149e2 /jdkX-build-image.yaml | |
| parent | 80c34418134366450d402fda8d8d79227b972de8 (diff) | |
jdk: Test only with default tier options.
Test with the default JVM. Don't force runs to use C1 or C2.
Change-Id: I2264dfa593d858ee37432615d3e6a3022ab223dd
Diffstat (limited to 'jdkX-build-image.yaml')
| -rw-r--r-- | jdkX-build-image.yaml | 25 |
1 files changed, 4 insertions, 21 deletions
diff --git a/jdkX-build-image.yaml b/jdkX-build-image.yaml index 68907afc..e1300c2c 100644 --- a/jdkX-build-image.yaml +++ b/jdkX-build-image.yaml @@ -25,12 +25,6 @@ axes: - axis: type: user-defined - name: JVM_VARIANT - values: - - server -# - zero - - axis: - type: user-defined name: BUILD_TYPE values: - release @@ -53,20 +47,11 @@ filter: 'out/jdkX.tar.gz' target: incoming flatten: true -# - copyartifact: -# project: archive-primordial-jdkX -# filter: 'out/primordial-jdkX.tar.gz' -# target: incoming -# flatten: true - shell: | #!/bin/bash set -exu - #export CCACHE_DIR=~/.ccache-${JVM_VARIANT}-${BUILD_TYPE} - #ccache -M 1G - #ccache -s - ccache_build_opts=--disable-ccache rm -rf jdk* primordial-jdk* build* @@ -83,8 +68,6 @@ shopt -s nullglob - - # Configure and build mkdir -p build-stage1 build-stage2 @@ -95,17 +78,17 @@ if [ $two_stage_build = 1 ]; then pushd build-stage1 - sh ../jdkX/configure --with-jvm-variants=${JVM_VARIANT} --with-debug-level=${BUILD_TYPE} --with-boot-jdk=${WORKSPACE}/primordial-jdkX ${ccache_build_opts} + sh ../jdkX/configure } --with-debug-level=${BUILD_TYPE} --with-boot-jdk=${WORKSPACE}/primordial-jdkX ${ccache_build_opts} make images build-test-hotspot-jtreg-native build-test-jdk-jtreg-native popd pushd build-stage2 - sh ../jdkX/configure --with-jvm-variants=${JVM_VARIANT} --with-debug-level=${BUILD_TYPE} --with-boot-jdk=${WORKSPACE}/build-stage1/images/jdk ${ccache_build_opts} + sh ../jdkX/configure --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 ../jdkX/configure --with-jvm-variants=${JVM_VARIANT} --with-debug-level=${BUILD_TYPE} ${ccache_build_opts} + sh ../jdkX/configure --with-debug-level=${BUILD_TYPE} ${ccache_build_opts} make images build-test-hotspot-jtreg-native build-test-jdk-jtreg-native popd fi @@ -113,7 +96,7 @@ # Archive the result rm -rf out mkdir out - artifact_name=jdkX-${JVM_VARIANT}-${BUILD_TYPE} + artifact_name=jdkX-${BUILD_TYPE} tar -C build-stage2/images/jdk --exclude=\*.diz --transform="s!^./!$artifact_name/!" -acf out/${artifact_name}.tar.gz . # Archive test support files. |