diff --git a/common.hocon b/common.hocon index a2bd5c8bfa68..984b50dc19bc 100644 --- a/common.hocon +++ b/common.hocon @@ -1,18 +1,30 @@ # overlay version -overlay = 2fa6fa642a6de2b8f07acc7940ce526193d9ab93 +overlay = 29b847f04b62506b6a9e07806ce476e99b6d850a -jdk-downloads: { - java8 : {name : openjdk, version : "8u121-jvmci-0.30", platformspecific: true} - java9 : {name : labsjdk, version : "9-20170703-141343", platformspecific: true} - java9EA : {name : labsjdk, version : "9+176", platformspecific: true} - java8Debug : {name : openjdk, version : "8u121-jvmci-0.30-fastdebug", platformspecific: true} +# labsjdk* are JDKs based on OracleJDK binaries +# openjdk* are JDKs based on OpenJDK binaries +jdks: { + openjdk8 : {name : openjdk, version : "8u121-jvmci-0.30", platformspecific: true} labsjdk8 : {name : labsjdk, version : "8u121-jvmci-0.30", platformspecific: true} + labsjdk9 : {name : labsjdk, version : "9-20170703-141343", platformspecific: true} + labsjdk9EA : {name : labsjdk, version : "9+176", platformspecific: true} + openjdk8Debug : {name : openjdk, version : "8u121-jvmci-0.30-fastdebug", platformspecific: true} labsjdk8Debug : {name : labsjdk, version : "8u121-jvmci-0.30-fastdebug", platformspecific: true} } # Overlay placeholder for pinning mx to a specific revision mx : {} +labsjdk8 : { downloads : { JAVA_HOME : ${jdks.labsjdk8} }} +labsjdk8Debug : { downloads : { JAVA_HOME : ${jdks.labsjdk8Debug} }} + +openjdk8 : { downloads : { JAVA_HOME : ${jdks.openjdk8} }} +openjdk8Debug : { downloads : { JAVA_HOME : ${jdks.openjdk8Debug} }} + +labsjdk9 : { downloads : { JAVA_HOME : ${jdks.labsjdk9}, EXTRA_JAVA_HOMES : { pathlist :[ ${jdks.labsjdk8} ]} }} +labsjdk9EA : { downloads : { JAVA_HOME : ${jdks.labsjdk9EA}, EXTRA_JAVA_HOMES : { pathlist :[ ${jdks.labsjdk8} ]} }} + + common : ${mx} { timelimit : "30:00" catch_files : [ @@ -66,45 +78,6 @@ linux-sparcv9 : ${linux} { capabilities : [linux, sparcv9] } -labsjdk8 : { - downloads : { - JAVA_HOME : ${jdk-downloads.labsjdk8} - } -} - -labsjdk8Debug : { - downloads : { - JAVA_HOME : ${jdk-downloads.labsjdk8Debug} - } -} - -java8 : { - downloads : { - JAVA_HOME : ${jdk-downloads.java8} - } -} - -java8Debug : { - downloads : { - JAVA_HOME : ${jdk-downloads.java8Debug} - } -} - -java9 : { - downloads : { - EXTRA_JAVA_HOMES : { pathlist :[ - ${jdk-downloads.java8} - ]} - JAVA_HOME : ${jdk-downloads.java9} - } -} - -java9EA : ${java9} { - downloads : { - JAVA_HOME : ${jdk-downloads.java9EA} - } -} - eclipse : { downloads : { ECLIPSE : {name: eclipse, version: "4.5.2", platformspecific: true} @@ -121,7 +94,7 @@ jdt : { } # for cases where a maven package is not easily accessible -maven-download-unix : ${java8} { +maven-download-unix : ${labsjdk8} { downloads : { MAVEN_HOME: {name: maven, version: "3.3.9", platformspecific: false} } @@ -144,7 +117,7 @@ darwin-deploy : ${darwin} ${maven-download-unix} { } } -deploy-binaries : ${java8} { +deploy-binaries : ${labsjdk8} { targets : [post-merge, deploy] run : [ ["mx", "--strict-compliance", "build"] @@ -152,7 +125,7 @@ deploy-binaries : ${java8} { ] } -maven-deploy-dry-run : ${java8} { +maven-deploy-dry-run : ${labsjdk8} { targets : [gate] run : [ ["mx", "--strict-compliance", "build"] diff --git a/compiler/ci_common/bench-hwloc.hocon b/compiler/ci_common/bench-hwloc.hocon index f654a10c0f53..8ccbebaa4392 100644 --- a/compiler/ci_common/bench-hwloc.hocon +++ b/compiler/ci_common/bench-hwloc.hocon @@ -1,5 +1,5 @@ # hwloc (Hardware Locality) provides means to bind a process to NUMA nodes -hwloc.bench-common-8 : { +hwloc.bench-common : { packages: {hwloc: ">=1.9"} environment: { BASE_BENCH_RESULTS_FILE_NAME: "bench-results.json" @@ -15,8 +15,8 @@ hwloc.bench-common-8 : { "*output.log" ] } -hwloc.scala.bench-common-8 : ${hwloc.bench-common-8} { - teardown : ${hwloc.bench-common-8.teardown} [ +hwloc.scala.bench-common : ${hwloc.bench-common} { + teardown : ${hwloc.bench-common.teardown} [ ["bench-uploader.py", "--url", "${BENCH_SERVER_URL}", "serial-node0-${BASE_BENCH_RESULTS_FILE_NAME}"] ["bench-uploader.py", "--url", "${BENCH_SERVER_URL}", "serial-node1-${BASE_BENCH_RESULTS_FILE_NAME}"] ] @@ -36,7 +36,7 @@ export.node1: [export, "MACHINE_NODE=1", "BENCH_RESULTS_FILE_PATH=node1-${BASE_B export.serial.node0: [export, "MACHINE_NODE=0", "BENCH_RESULTS_FILE_PATH=serial-node0-${BASE_BENCH_RESULTS_FILE_NAME}"] export.serial.node1: [export, "MACHINE_NODE=1", "BENCH_RESULTS_FILE_PATH=serial-node1-${BASE_BENCH_RESULTS_FILE_NAME}"] -bench-dacapo-hwloc: ${bench-dacapo} ${hwloc.bench-common-8} { +bench-dacapo-hwloc: ${bench-dacapo} ${hwloc.bench-common} { run: [ [export, "LOGDIR=${PWD}"] ${export.node0} @@ -47,7 +47,7 @@ bench-dacapo-hwloc: ${bench-dacapo} ${hwloc.bench-common-8} { ] } -bench-dacapo-timing-hwloc: ${bench-dacapo-timing} ${hwloc.bench-common-8} { +bench-dacapo-timing-hwloc: ${bench-dacapo-timing} ${hwloc.bench-common} { run: [ [export, "LOGDIR=${PWD}"] ${export.node0} @@ -58,7 +58,7 @@ bench-dacapo-timing-hwloc: ${bench-dacapo-timing} ${hwloc.bench-common-8} { ] } -bench-dacapo-move-profiling-hwloc: ${bench-dacapo-move-profiling} ${hwloc.bench-common-8} { +bench-dacapo-move-profiling-hwloc: ${bench-dacapo-move-profiling} ${hwloc.bench-common} { run: [ [export, "LOGDIR=${PWD}"] ${export.node0} @@ -82,7 +82,7 @@ bench-hwloc-only-scala-actors : { } -bench-scala-dacapo-hwloc: ${bench-scala-dacapo} ${hwloc.scala.bench-common-8} { +bench-scala-dacapo-hwloc: ${bench-scala-dacapo} ${hwloc.scala.bench-common} { run: [ [export, "LOGDIR=${PWD}"] ${export.node0} @@ -97,7 +97,7 @@ bench-scala-dacapo-hwloc: ${bench-scala-dacapo} ${hwloc.scala.bench-common-8} { ] } -bench-scala-dacapo-timing-hwloc: ${bench-scala-dacapo-timing} ${hwloc.scala.bench-common-8} { +bench-scala-dacapo-timing-hwloc: ${bench-scala-dacapo-timing} ${hwloc.scala.bench-common} { run: [ [export, "LOGDIR=${PWD}"] ${export.node0} @@ -112,7 +112,7 @@ bench-scala-dacapo-timing-hwloc: ${bench-scala-dacapo-timing} ${hwloc.scala.benc ] } -bench-scala-dacapo-move-profiling-hwloc: ${bench-scala-dacapo-move-profiling} ${hwloc.scala.bench-common-8} { +bench-scala-dacapo-move-profiling-hwloc: ${bench-scala-dacapo-move-profiling} ${hwloc.scala.bench-common} { run: [ [export, "LOGDIR=${PWD}"] ${export.node0} @@ -129,7 +129,7 @@ bench-scala-dacapo-move-profiling-hwloc: ${bench-scala-dacapo-move-profiling} ${ # Renaissance-related targets -bench-renaissance-hwloc: ${bench-renaissance} ${hwloc.bench-common-8} { +bench-renaissance-hwloc: ${bench-renaissance} ${hwloc.bench-common} { run: [ [export, "LOGDIR=${PWD}"] ${export.node0} diff --git a/compiler/ci_common/bench.hocon b/compiler/ci_common/bench.hocon index 24af1b25f8f5..a3b095ee1eae 100644 --- a/compiler/ci_common/bench.hocon +++ b/compiler/ci_common/bench.hocon @@ -19,7 +19,7 @@ bench-jvmci : { mx-teardown : ["bench-uploader.py", "--url", "${BENCH_SERVER_URL}", "${BENCH_RESULTS_FILE_PATH}"] } -bench-common-8 : ${java8} ${compilerCommon} { +bench-common : ${compilerCommon} { environment: { BENCH_RESULTS_FILE_PATH: "bench-results.json" } @@ -31,21 +31,21 @@ bench-common-8 : ${java8} ${compilerCommon} { ] } -bench-dacapo: ${bench-common-8} { +bench-dacapo: ${bench-common} { targets : [bench, post-merge] run: [ ${bench-jvmci.mx-dacapo} ${bench-arguments} ] } -bench-dacapo-timing: ${bench-common-8} { +bench-dacapo-timing: ${bench-common} { targets: [bench, daily] run: [ ${bench-jvmci.mx-dacapo-timing} ${bench-arguments} ] } -bench-dacapo-move-profiling: ${bench-common-8} { +bench-dacapo-move-profiling: ${bench-common} { targets: [bench, daily] run: [ ${bench-jvmci.mx-dacapo-move-profiling} ${bench-arguments} @@ -54,21 +54,21 @@ bench-dacapo-move-profiling: ${bench-common-8} { # Scala DaCapo-related targets -bench-scala-dacapo: ${bench-common-8} { +bench-scala-dacapo: ${bench-common} { targets: [bench, post-merge] run: [ ${bench-jvmci.mx-scala-dacapo} ${bench-arguments} ] } -bench-scala-dacapo-timing: ${bench-common-8} { +bench-scala-dacapo-timing: ${bench-common} { targets: [bench, daily] run: [ ${bench-jvmci.mx-scala-dacapo-timing} ${bench-arguments} ] } -bench-scala-dacapo-move-profiling: ${bench-common-8} { +bench-scala-dacapo-move-profiling: ${bench-common} { targets: [bench, daily] run: [ ${bench-jvmci.mx-scala-dacapo-move-profiling} ${bench-arguments} @@ -77,7 +77,7 @@ bench-scala-dacapo-move-profiling: ${bench-common-8} { # SPECjbb2005-related targets -bench-specjbb2005: ${bench-common-8} { +bench-specjbb2005: ${bench-common} { targets: [bench, post-merge] downloads: { SPECJBB2005: { name: specjbb2005, version: "1.07" } @@ -89,11 +89,11 @@ bench-specjbb2005: ${bench-common-8} { } # SPECJvm2008-related targets -bench-specjvm2008: ${bench-common-8} { +bench-specjvm2008: ${bench-common} { downloads: { SPECJVM2008: { name: specjvm2008, version: "1.01" } } - teardown: ${bench-common-8.teardown} [ + teardown: ${bench-common.teardown} [ [rm, "-r", "${SPECJVM2008}/results"] ] timelimit: "2:50:00" @@ -119,7 +119,7 @@ bench-specjvm2008-OneVM: ${bench-specjvm2008} { # SPECjbb2015-related targets -bench-specjbb2015: ${bench-common-8} { +bench-specjbb2015: ${bench-common} { targets: [bench, post-merge] run: [ ${bench-jvmci.mx-specjbb2015} ${bench-arguments} @@ -132,7 +132,7 @@ bench-specjbb2015: ${bench-common-8} { # JMH micros graal -bench-micros-graal: ${bench-common-8} { +bench-micros-graal: ${bench-common} { targets: [weekly] run: [ ${bench-jvmci.mx-micros-graal} ${bench-arguments} @@ -142,7 +142,7 @@ bench-micros-graal: ${bench-common-8} { # Renaissance-related targets -bench-renaissance: ${bench-common-8} { +bench-renaissance: ${bench-common} { targets: [bench, post-merge] run: [ ${bench-jvmci.mx-renaissance} ${bench-arguments} diff --git a/compiler/ci_common/gate.hocon b/compiler/ci_common/gate.hocon index b8de85cc24e6..795e6d50116c 100644 --- a/compiler/ci_common/gate.hocon +++ b/compiler/ci_common/gate.hocon @@ -57,27 +57,7 @@ gateBootstrapFullVerify : { ] } -gateTest8 : ${gateTest} ${java8} -gateTestLabs8 : ${gateTest} ${labsjdk8} -gateTestCTW8 : ${gateTestCTW} ${java8} -gateTestCTWLabs8 : ${gateTestCTW} ${labsjdk8} -gateTestCTW9 : ${gateTestCTW} ${java9} -gateTest8Debug : ${gateTest} ${java8Debug} -gateTest9 : ${gateTest} ${java9} -gateTest9EA : ${gateTest} ${java9EA} -gateTestBenchmark8 : ${gateTestBenchmark} ${labsjdk8} -gateTestBenchmark8Debug : ${gateTestBenchmark} ${labsjdk8Debug} -gateTestBenchmark9 : ${gateTestBenchmark} ${java9} -gateBootstrap8 : ${gateBootstrap} ${java8} -gateBootstrapLabs8 : ${gateBootstrap} ${labsjdk8} -gateBootstrap9 : ${gateBootstrap} ${java9} -gateBootstrap9EA : ${gateBootstrap} ${java9EA} -gateBootstrap8FullVerify: ${gateBootstrapFullVerify} ${java8} -gateBootstrapLite8 : ${gateBootstrapLite} ${java8} -gateBootstrapLiteLabs8 : ${gateBootstrapLite} ${labsjdk8} -gateBootstrapLite9 : ${gateBootstrapLite} ${java9} - -gateStyle : ${java8} ${eclipse} ${jdt} { +gateStyle : ${eclipse} ${jdt} { downloads : { JDT : {name: ecj, version: "4.5.1", platformspecific: false} ECLIPSE : {name: eclipse, version: "4.5.2", platformspecific: true} diff --git a/compiler/ci_common/gate_tasks.hocon b/compiler/ci_common/gate_tasks.hocon index 13de5fa583da..f855a23e1027 100644 --- a/compiler/ci_common/gate_tasks.hocon +++ b/compiler/ci_common/gate_tasks.hocon @@ -2,35 +2,35 @@ builds += [ # Darwin AMD64 - ${gateTest8} ${gateDarwinAMD64} {name: "gate-compiler-test-8-darwin-amd64", targets : [weekly]} - ${gateTest9} ${gateDarwinAMD64} {name: "gate-compiler-test-9-darwin-amd64", targets : [weekly]} - ${gateTest9EA} ${gateDarwinAMD64} {name: "gate-compiler-test-9EA-darwin-amd64", targets : [weekly]} -# ${gateTestBenchmark8} ${gateDarwinAMD64} {name: "gate-compiler-benchmarktest-8-darwin-amd64", targets : [weekly]} + ${gateTest} ${labsjdk8} ${gateDarwinAMD64} {name: "gate-compiler-test-8-darwin-amd64", targets : [weekly]} + ${gateTest} ${labsjdk9} ${gateDarwinAMD64} {name: "gate-compiler-test-9-darwin-amd64", targets : [weekly]} + ${gateTest} ${labsjdk9EA} ${gateDarwinAMD64} {name: "gate-compiler-test-9EA-darwin-amd64", targets : [weekly]} +# ${gateTestBenchmark} ${labsjdk8} ${gateDarwinAMD64} {name: "gate-compiler-benchmarktest-8-darwin-amd64", targets : [weekly]} # Linux AMD64 - ${gateTest8} ${gateLinuxAMD64} {name: "gate-compiler-test-8-linux-amd64"} - ${gateTest9} ${gateLinuxAMD64} {name: "gate-compiler-test-9-linux-amd64"} - ${gateTest9EA} ${gateLinuxAMD64} {name: "gate-compiler-test-9EA-linux-amd64"} - ${gateTestCTW8} ${gateLinuxAMD64} {name: "gate-compiler-ctw-8-linux-amd64"} - ${gateTestCTW9} ${gateLinuxAMD64} {name: "gate-compiler-ctw-9-linux-amd64", targets : [weekly]} - ${gateTest8Debug} ${gateLinuxAMD64} {name: "gate-compiler-test-8-linux-amd64-fastdebug", targets : [weekly]} - ${gateTestBenchmark8} ${gateLinuxAMD64} {name: "gate-compiler-benchmarktest-8-linux-amd64"} - ${gateTestBenchmark8Debug} ${gateLinuxAMD64} {name: "gate-compiler-benchmarktest-8-linux-amd64-fastdebug", targets : [weekly]} - ${gateStyle} ${gateLinuxAMD64} {name: "gate-compiler-style-linux-amd64"} + ${gateTest} ${openjdk8} ${gateLinuxAMD64} {name: "gate-compiler-test-8-linux-amd64"} + ${gateTest} ${labsjdk9} ${gateLinuxAMD64} {name: "gate-compiler-test-9-linux-amd64"} + ${gateTest} ${labsjdk9EA} ${gateLinuxAMD64} {name: "gate-compiler-test-9EA-linux-amd64"} + ${gateTestCTW} ${openjdk8} ${gateLinuxAMD64} {name: "gate-compiler-ctw-8-linux-amd64"} + ${gateTestCTW} ${labsjdk9} ${gateLinuxAMD64} {name: "gate-compiler-ctw-9-linux-amd64", targets : [weekly]} + ${gateTest} ${openjdk8Debug} ${gateLinuxAMD64} {name: "gate-compiler-test-8-linux-amd64-fastdebug", targets : [weekly]} + ${gateTestBenchmark} ${openjdk8} ${gateLinuxAMD64} {name: "gate-compiler-benchmarktest-8-linux-amd64"} + ${gateTestBenchmark} ${openjdk8Debug} ${gateLinuxAMD64} {name: "gate-compiler-benchmarktest-8-linux-amd64-fastdebug", targets : [weekly]} + ${gateStyle} ${openjdk8} ${gateLinuxAMD64} {name: "gate-compiler-style-linux-amd64"} # Solaris SPARC - ${gateTest8} ${gateSolarisSPARC} {name: "gate-compiler-test-8-solaris-sparcv9", timelimit: "1:00:00"} - ${gateTest9} ${gateSolarisSPARC} {name: "gate-compiler-test-9-solaris-sparcv9", timelimit: "1:00:00"} - ${gateTestCTW8} ${gateSolarisSPARC} {name: "gate-compiler-ctw-8-solaris-sparcv9", timelimit: "1:00:00"} - ${gateTestCTW9} ${gateSolarisSPARC} {name: "gate-compiler-ctw-9-solaris-sparcv9", timelimit: "1:00:00", targets : [weekly]} - ${gateTest8Debug} ${gateSolarisSPARC} {name: "gate-compiler-test-8-solaris-sparcv9-fastdebug", timelimit: "1:00:00", targets : [weekly]} - ${gateTestBenchmark8} ${gateSolarisSPARC} {name: "gate-compiler-benchmarktest-8-solaris-sparcv9", timelimit: "1:00:00"} -# ${gateTestBenchmark8Debug} ${gateSolarisSPARC} {name: "gate-compiler-benchmarktest-8-solaris-sparcv9-fastdebug", timelimit: "1:00:00"} + ${gateTest} ${labsjdk8} ${gateSolarisSPARC} {name: "gate-compiler-test-8-solaris-sparcv9", timelimit: "1:00:00"} + ${gateTest} ${labsjdk9} ${gateSolarisSPARC} {name: "gate-compiler-test-9-solaris-sparcv9", timelimit: "1:00:00"} + ${gateTestCTW} ${labsjdk8} ${gateSolarisSPARC} {name: "gate-compiler-ctw-8-solaris-sparcv9", timelimit: "1:00:00"} + ${gateTestCTW} ${labsjdk9} ${gateSolarisSPARC} {name: "gate-compiler-ctw-9-solaris-sparcv9", timelimit: "1:00:00", targets : [weekly]} + ${gateTest} ${labsjdk8Debug} ${gateSolarisSPARC} {name: "gate-compiler-test-8-solaris-sparcv9-fastdebug", timelimit: "1:00:00", targets : [weekly]} + ${gateTestBenchmark} ${labsjdk8} ${gateSolarisSPARC} {name: "gate-compiler-benchmarktest-8-solaris-sparcv9", timelimit: "1:00:00"} +# ${gateTestBenchmark} ${labsjdk8Debug} ${gateSolarisSPARC} {name: "gate-compiler-benchmarktest-8-solaris-sparcv9-fastdebug", timelimit: "1:00:00"} # Linux SPARC - ${gateTestLabs8} ${gateLinuxSPARC} {name: "gate-compiler-test-8-linux-sparcv9", timelimit: "1:00:00"} + ${gateTest} ${labsjdk8} ${gateLinuxSPARC} {name: "gate-compiler-test-8-linux-sparcv9", timelimit: "1:00:00"} # TraceRA - ${gateTest8} ${gateLinuxAMD64TraceRA} {name: "gate-compiler-test-8-linux-amd64-tracera", targets : [weekly]} - ${gateTest8} ${gateLinuxAMD64TraceRABU} {name: "gate-compiler-test-8-linux-amd64-tracera-bu", targets : [weekly]} + ${gateTest} ${openjdk8} ${gateLinuxAMD64TraceRA} {name: "gate-compiler-test-8-linux-amd64-tracera", targets : [weekly]} + ${gateTest} ${openjdk8} ${gateLinuxAMD64TraceRABU} {name: "gate-compiler-test-8-linux-amd64-tracera-bu", targets : [weekly]} ] diff --git a/compiler/ci_common/gate_tasks_bootstrap.hocon b/compiler/ci_common/gate_tasks_bootstrap.hocon index 45ac0cf7ac9b..19e65d189246 100644 --- a/compiler/ci_common/gate_tasks_bootstrap.hocon +++ b/compiler/ci_common/gate_tasks_bootstrap.hocon @@ -1,29 +1,29 @@ builds += [ # Darwin AMD64 - ${gateBootstrapLite8} ${gateDarwinAMD64Bootstrap} {name: "gate-compiler-bootstraplite-8-darwin-amd64"} - ${gateBootstrapLiteLabs8} ${gateDarwinAMD64Bootstrap} {name: "gate-compiler-bootstraplite-labsjdk8-darwin-amd64", targets : [weekly]} - ${gateBootstrapLite9} ${gateDarwinAMD64Bootstrap} {name: "gate-compiler-bootstraplite-9-darwin-amd64", targets : [weekly]} + ${gateBootstrapLite} ${labsjdk8} ${gateDarwinAMD64Bootstrap} {name: "gate-compiler-bootstraplite-8-darwin-amd64"} + ${gateBootstrapLite} ${labsjdk8} ${gateDarwinAMD64Bootstrap} {name: "gate-compiler-bootstraplite-labsjdk8-darwin-amd64", targets : [weekly]} + ${gateBootstrapLite} ${labsjdk9} ${gateDarwinAMD64Bootstrap} {name: "gate-compiler-bootstraplite-9-darwin-amd64", targets : [weekly]} # Linux AMD64 - ${gateBootstrap8} ${gateLinuxAMD64Bootstrap} {name: "gate-compiler-bootstrap-8-linux-amd64"} - ${gateBootstrapLabs8} ${gateLinuxAMD64Bootstrap} {name: "gate-compiler-bootstrap-labsjdk8-linux-amd64", targets : [weekly]} - ${gateBootstrap8FullVerify} ${gateLinuxAMD64Bootstrap} {name: "gate-compiler-bootstrapfullverify-8-linux-amd64"} - ${gateBootstrap9} ${gateLinuxAMD64Bootstrap} {name: "gate-compiler-bootstrap-9-linux-amd64"} - ${gateBootstrap9EA} ${gateLinuxAMD64Bootstrap} {name: "gate-compiler-bootstrap-9EA-linux-amd64", targets : [weekly]} + ${gateBootstrap} ${openjdk8} ${gateLinuxAMD64Bootstrap} {name: "gate-compiler-bootstrap-8-linux-amd64"} + ${gateBootstrap} ${openjdk8} ${gateLinuxAMD64Bootstrap} {name: "gate-compiler-bootstrap-labsjdk8-linux-amd64", targets : [weekly]} + ${gateBootstrapFullVerify} ${openjdk8} ${gateLinuxAMD64Bootstrap} {name: "gate-compiler-bootstrapfullverify-8-linux-amd64"} + ${gateBootstrap} ${labsjdk9} ${gateLinuxAMD64Bootstrap} {name: "gate-compiler-bootstrap-9-linux-amd64"} + ${gateBootstrap} ${labsjdk9EA} ${gateLinuxAMD64Bootstrap} {name: "gate-compiler-bootstrap-9EA-linux-amd64", targets : [weekly]} # Solaris SPARC - ${gateBootstrap8} ${gateSolarisSPARCBootstrap} {name: "gate-compiler-bootstrap-8-solaris-sparcv9", timelimit: "1:00:00"} - ${gateBootstrapLabs8} ${gateSolarisSPARCBootstrap} {name: "gate-compiler-bootstrap-labsjdk8-solaris-sparcv9", timelimit: "1:00:00", targets : [weekly]} - ${gateBootstrap9} ${gateSolarisSPARCBootstrap} {name: "gate-compiler-bootstrap-9-solaris-sparcv9", timelimit: "1:00:00", targets : [weekly]} - ${gateBootstrap9EA} ${gateSolarisSPARCBootstrap} {name: "gate-compiler-bootstrap-9EA-solaris-sparcv9", timelimit: "1:00:00", targets : [weekly]} + ${gateBootstrap} ${labsjdk8} ${gateSolarisSPARCBootstrap} {name: "gate-compiler-bootstrap-8-solaris-sparcv9", timelimit: "1:00:00"} + ${gateBootstrap} ${labsjdk8} ${gateSolarisSPARCBootstrap} {name: "gate-compiler-bootstrap-labsjdk8-solaris-sparcv9", timelimit: "1:00:00", targets : [weekly]} + ${gateBootstrap} ${labsjdk9} ${gateSolarisSPARCBootstrap} {name: "gate-compiler-bootstrap-9-solaris-sparcv9", timelimit: "1:00:00", targets : [weekly]} + ${gateBootstrap} ${labsjdk9EA} ${gateSolarisSPARCBootstrap} {name: "gate-compiler-bootstrap-9EA-solaris-sparcv9", timelimit: "1:00:00", targets : [weekly]} # Linux SPARC - ${gateBootstrapLabs8} ${gateLinuxSPARCBootstrap} {name: "gate-compiler-bootstrap-labsjdk8-linux-sparcv9", timelimit: "1:00:00", targets : [weekly]} + ${gateBootstrap} ${labsjdk8} ${gateLinuxSPARCBootstrap} {name: "gate-compiler-bootstrap-labsjdk8-linux-sparcv9", timelimit: "1:00:00", targets : [weekly]} # Linux AMD64 TraceRA - ${gateBootstrap8FullVerify} ${gateLinuxAMD64TraceRABootstrap} {name: "gate-compiler-bootstrapfullverify-8-linux-amd64-tracera", targets : [weekly]} + ${gateBootstrapFullVerify} ${openjdk8} ${gateLinuxAMD64TraceRABootstrap} {name: "gate-compiler-bootstrapfullverify-8-linux-amd64-tracera", targets : [weekly]} # Linux AMD64 TraceRA-BU - ${gateBootstrap8} ${gateLinuxAMD64TraceRABUBootstrap} {name: "gate-compiler-bootstrap-8-linux-amd64-tracera-bu", targets : [weekly]} + ${gateBootstrap} ${openjdk8} ${gateLinuxAMD64TraceRABUBootstrap} {name: "gate-compiler-bootstrap-8-linux-amd64-tracera-bu", targets : [weekly]} ] diff --git a/compiler/ci_common/m7_eighth.hocon b/compiler/ci_common/m7_eighth.hocon index 37eac061ff52..285a67137b47 100644 --- a/compiler/ci_common/m7_eighth.hocon +++ b/compiler/ci_common/m7_eighth.hocon @@ -19,17 +19,17 @@ m7_eighth.default-g1gc : ${m7_eighth.default} { builds += [ - ${m7_eighth.default} ${bench-dacapo} { name: "bench-compiler-dacapo-solaris-m7_eighth", timelimit: "1:00:00" } - ${m7_eighth.default} ${bench-dacapo-timing} { name: "bench-compiler-dacapo-timing-solaris-m7_eighth", timelimit: "1:00:00" } - ${m7_eighth.default} ${bench-scala-dacapo} { name: "bench-compiler-scala-dacapo-solaris-m7_eighth", timelimit: "1:00:00" } - ${m7_eighth.default} ${bench-scala-dacapo-timing} { name: "bench-compiler-scala-dacapo-timing-solaris-m7_eighth", timelimit: "1:00:00" } - ${m7_eighth.default} ${bench-specjvm2008-Single} { name: "bench-compiler-specjvm2008-Single-solaris-m7_eighth" } - ${m7_eighth.default} ${bench-specjvm2008-OneVM} { name: "bench-compiler-specjvm2008-OneVM-solaris-m7_eighth" } - ${m7_eighth.default} ${bench-specjbb2015} { name: "bench-compiler-specjbb2015-solaris-m7_eighth" } - ${m7_eighth.default} ${bench-micros-graal} { name: "bench-compiler-jmh-micros-graal-solaris-m7_eighth" } + ${m7_eighth.default} ${bench-dacapo} ${labsjdk8} { name: "bench-compiler-dacapo-solaris-m7_eighth", timelimit: "1:00:00" } + ${m7_eighth.default} ${bench-dacapo-timing} ${labsjdk8} { name: "bench-compiler-dacapo-timing-solaris-m7_eighth", timelimit: "1:00:00" } + ${m7_eighth.default} ${bench-scala-dacapo} ${labsjdk8} { name: "bench-compiler-scala-dacapo-solaris-m7_eighth", timelimit: "1:00:00" } + ${m7_eighth.default} ${bench-scala-dacapo-timing} ${labsjdk8} { name: "bench-compiler-scala-dacapo-timing-solaris-m7_eighth", timelimit: "1:00:00" } + ${m7_eighth.default} ${bench-specjvm2008-Single} ${labsjdk8} { name: "bench-compiler-specjvm2008-Single-solaris-m7_eighth" } + ${m7_eighth.default} ${bench-specjvm2008-OneVM} ${labsjdk8} { name: "bench-compiler-specjvm2008-OneVM-solaris-m7_eighth" } + ${m7_eighth.default} ${bench-specjbb2015} ${labsjdk8} { name: "bench-compiler-specjbb2015-solaris-m7_eighth" } + ${m7_eighth.default} ${bench-micros-graal} ${labsjdk8} { name: "bench-compiler-jmh-micros-graal-solaris-m7_eighth" } - ${m7_eighth.default-g1gc} ${bench-dacapo} { targets : [weekly, bench], name: "bench-compiler-dacapo-g1gc-solaris-m7_eighth", timelimit: "1:00:00" } - ${m7_eighth.default-g1gc} ${bench-scala-dacapo} { targets : [weekly, bench], name: "bench-compiler-scala-dacapo-g1gc-solaris-m7_eighth", timelimit: "1:00:00" } - ${m7_eighth.default-g1gc} ${bench-specjvm2008-Single} { targets : [weekly, bench], name: "bench-compiler-specjvm2008-g1gc-Single-solaris-m7_eighth" } - ${m7_eighth.default-g1gc} ${bench-specjbb2015} { targets : [weekly, bench], name: "bench-compiler-specjbb2015-g1gc-solaris-m7_eighth" } + ${m7_eighth.default-g1gc} ${bench-dacapo} ${labsjdk8} { targets : [weekly, bench], name: "bench-compiler-dacapo-g1gc-solaris-m7_eighth", timelimit: "1:00:00" } + ${m7_eighth.default-g1gc} ${bench-scala-dacapo} ${labsjdk8} { targets : [weekly, bench], name: "bench-compiler-scala-dacapo-g1gc-solaris-m7_eighth", timelimit: "1:00:00" } + ${m7_eighth.default-g1gc} ${bench-specjvm2008-Single} ${labsjdk8} { targets : [weekly, bench], name: "bench-compiler-specjvm2008-g1gc-Single-solaris-m7_eighth" } + ${m7_eighth.default-g1gc} ${bench-specjbb2015} ${labsjdk8} { targets : [weekly, bench], name: "bench-compiler-specjbb2015-g1gc-solaris-m7_eighth" } ] diff --git a/compiler/ci_common/x32-tracera.hocon b/compiler/ci_common/x32-tracera.hocon index 71cacae28789..6b34aecd6d7d 100644 --- a/compiler/ci_common/x32-tracera.hocon +++ b/compiler/ci_common/x32-tracera.hocon @@ -5,5 +5,5 @@ x32.tracera: ${x32.default} { } builds += [ - ${x32.tracera} ${bench-renaissance-hwloc} { targets : [bench, daily], name: "bench-compiler-renaissance-linux-x32-tracera" } + ${x32.tracera} ${bench-renaissance-hwloc} ${openjdk8} { targets : [bench, daily], name: "bench-compiler-renaissance-linux-x32-tracera" } ] diff --git a/compiler/ci_common/x32.hocon b/compiler/ci_common/x32.hocon index 02cdb4d6ef90..b322088a510a 100644 --- a/compiler/ci_common/x32.hocon +++ b/compiler/ci_common/x32.hocon @@ -16,7 +16,7 @@ x32.default-g1gc : ${x32.default} { } builds += [ - ${x32.default} ${bench-renaissance-hwloc} { name: "bench-compiler-renaissance-linux-x32" } + ${x32.default} ${bench-renaissance-hwloc} ${openjdk8} { name: "bench-compiler-renaissance-linux-x32" } - ${x32.default-g1gc} ${bench-renaissance-hwloc} { targets : [weekly, bench], name: "bench-compiler-renaissance-g1gc-linux-x32" } + ${x32.default-g1gc} ${bench-renaissance-hwloc} ${openjdk8} { targets : [weekly, bench], name: "bench-compiler-renaissance-g1gc-linux-x32" } ] diff --git a/compiler/ci_common/x4150.hocon b/compiler/ci_common/x4150.hocon index 49c588b1afc2..92f5ca33d920 100644 --- a/compiler/ci_common/x4150.hocon +++ b/compiler/ci_common/x4150.hocon @@ -16,7 +16,7 @@ x4150.default-g1gc : ${x4150.default} { } builds += [ - ${x4150.default} ${bench-specjbb2005} { name: "bench-compiler-specjbb2005-linux-x4150"} + ${x4150.default} ${bench-specjbb2005} ${openjdk8} { name: "bench-compiler-specjbb2005-linux-x4150"} - ${x4150.default-g1gc} ${bench-specjbb2005} { targets : [weekly, bench], name: "bench-compiler-specjbb2005-g1gc-linux-x4150"} + ${x4150.default-g1gc} ${bench-specjbb2005} ${openjdk8} { targets : [weekly, bench], name: "bench-compiler-specjbb2005-g1gc-linux-x4150"} ] diff --git a/compiler/ci_common/x52-tracera.hocon b/compiler/ci_common/x52-tracera.hocon index 3d8067fcb149..23c9d663d982 100644 --- a/compiler/ci_common/x52-tracera.hocon +++ b/compiler/ci_common/x52-tracera.hocon @@ -16,21 +16,21 @@ x52.tracera-bu-tmpfs10g: ${x52.default} { } builds += [ - ${x52.tracera-tmpfs10g} ${bench-dacapo-hwloc} { targets : [bench, daily], name: "bench-compiler-dacapo-linux-x52-tracera" } - ${x52.tracera-tmpfs10g} ${bench-dacapo-timing-hwloc} { targets : [bench, weekly], name: "bench-compiler-dacapo-timing-linux-x52-tracera" } - ${x52.tracera-tmpfs10g} ${bench-dacapo-move-profiling-hwloc} { targets : [bench, weekly], name: "bench-compiler-dacapo-move-profiling-linux-x52-tracera" } - ${x52.tracera-tmpfs10g} ${bench-scala-dacapo-hwloc} { targets : [bench, daily], name: "bench-compiler-scala-dacapo-linux-x52-tracera" } - ${x52.tracera-tmpfs10g} ${bench-scala-dacapo-timing-hwloc} { targets : [bench, weekly], name: "bench-compiler-scala-dacapo-timing-linux-x52-tracera" } - ${x52.tracera-tmpfs10g} ${bench-scala-dacapo-move-profiling-hwloc} { targets : [bench, weekly], name: "bench-compiler-scala-dacapo-move-profiling-linux-x52-tracera" } - ${x52.tracera} ${bench-specjvm2008-Single} { targets : [bench, daily], name: "bench-compiler-specjvm2008-Single-linux-x52-tracera" } - ${x52.tracera} ${bench-specjvm2008-OneVM} { targets : [bench, weekly], name: "bench-compiler-specjvm2008-OneVM-linux-x52-tracera" } - ${x52.tracera} ${bench-specjbb2015} { targets : [bench, daily], name: "bench-compiler-specjbb2015-linux-x52-tracera" } - ${x52.tracera} ${bench-micros-graal} { targets : [weekly], name: "bench-compiler-jmh-micros-graal-linux-x52-tracera" } + ${x52.tracera-tmpfs10g} ${bench-dacapo-hwloc} ${openjdk8} { targets : [bench, daily], name: "bench-compiler-dacapo-linux-x52-tracera" } + ${x52.tracera-tmpfs10g} ${bench-dacapo-timing-hwloc} ${openjdk8} { targets : [bench, weekly], name: "bench-compiler-dacapo-timing-linux-x52-tracera" } + ${x52.tracera-tmpfs10g} ${bench-dacapo-move-profiling-hwloc} ${openjdk8} { targets : [bench, weekly], name: "bench-compiler-dacapo-move-profiling-linux-x52-tracera" } + ${x52.tracera-tmpfs10g} ${bench-scala-dacapo-hwloc} ${openjdk8} { targets : [bench, daily], name: "bench-compiler-scala-dacapo-linux-x52-tracera" } + ${x52.tracera-tmpfs10g} ${bench-scala-dacapo-timing-hwloc} ${openjdk8} { targets : [bench, weekly], name: "bench-compiler-scala-dacapo-timing-linux-x52-tracera" } + ${x52.tracera-tmpfs10g} ${bench-scala-dacapo-move-profiling-hwloc} ${openjdk8} { targets : [bench, weekly], name: "bench-compiler-scala-dacapo-move-profiling-linux-x52-tracera" } + ${x52.tracera} ${bench-specjvm2008-Single} ${openjdk8} { targets : [bench, daily], name: "bench-compiler-specjvm2008-Single-linux-x52-tracera" } + ${x52.tracera} ${bench-specjvm2008-OneVM} ${openjdk8} { targets : [bench, weekly], name: "bench-compiler-specjvm2008-OneVM-linux-x52-tracera" } + ${x52.tracera} ${bench-specjbb2015} ${openjdk8} { targets : [bench, daily], name: "bench-compiler-specjbb2015-linux-x52-tracera" } + ${x52.tracera} ${bench-micros-graal} ${openjdk8} { targets : [weekly], name: "bench-compiler-jmh-micros-graal-linux-x52-tracera" } - ${x52.tracera-bu-tmpfs10g} ${bench-dacapo-hwloc} { targets : [weekly, bench], name: "bench-compiler-dacapo-linux-x52-tracera-bu" } - ${x52.tracera-bu-tmpfs10g} ${bench-dacapo-timing-hwloc} { targets : [weekly, bench], name: "bench-compiler-dacapo-timing-linux-x52-tracera-bu" } - ${x52.tracera-bu-tmpfs10g} ${bench-dacapo-move-profiling-hwloc} { targets : [weekly, bench], name: "bench-compiler-dacapo-move-profiling-linux-x52-tracera-bu" } - ${x52.tracera-bu-tmpfs10g} ${bench-scala-dacapo-hwloc} { targets : [weekly, bench], name: "bench-compiler-scala-dacapo-linux-x52-tracera-bu" } - ${x52.tracera-bu-tmpfs10g} ${bench-scala-dacapo-timing-hwloc} { targets : [weekly, bench], name: "bench-compiler-scala-dacapo-timing-linux-x52-tracera-bu" } - ${x52.tracera-bu-tmpfs10g} ${bench-scala-dacapo-move-profiling-hwloc} { targets : [weekly, bench], name: "bench-compiler-scala-dacapo-move-profiling-linux-x52-tracera-bu" } + ${x52.tracera-bu-tmpfs10g} ${bench-dacapo-hwloc} ${openjdk8} { targets : [weekly, bench], name: "bench-compiler-dacapo-linux-x52-tracera-bu" } + ${x52.tracera-bu-tmpfs10g} ${bench-dacapo-timing-hwloc} ${openjdk8} { targets : [weekly, bench], name: "bench-compiler-dacapo-timing-linux-x52-tracera-bu" } + ${x52.tracera-bu-tmpfs10g} ${bench-dacapo-move-profiling-hwloc} ${openjdk8} { targets : [weekly, bench], name: "bench-compiler-dacapo-move-profiling-linux-x52-tracera-bu" } + ${x52.tracera-bu-tmpfs10g} ${bench-scala-dacapo-hwloc} ${openjdk8} { targets : [weekly, bench], name: "bench-compiler-scala-dacapo-linux-x52-tracera-bu" } + ${x52.tracera-bu-tmpfs10g} ${bench-scala-dacapo-timing-hwloc} ${openjdk8} { targets : [weekly, bench], name: "bench-compiler-scala-dacapo-timing-linux-x52-tracera-bu" } + ${x52.tracera-bu-tmpfs10g} ${bench-scala-dacapo-move-profiling-hwloc} ${openjdk8} { targets : [weekly, bench], name: "bench-compiler-scala-dacapo-move-profiling-linux-x52-tracera-bu" } ] diff --git a/compiler/ci_common/x52.hocon b/compiler/ci_common/x52.hocon index 9d94a9bec4d6..a774ebde3e06 100644 --- a/compiler/ci_common/x52.hocon +++ b/compiler/ci_common/x52.hocon @@ -20,19 +20,19 @@ x52.tmpfs10g-g1gc: ${x52.tmpfs10g} { } builds += [ - ${x52.tmpfs10g} ${bench-dacapo-hwloc} { name: "bench-compiler-dacapo-linux-x52" } - ${x52.tmpfs10g} ${bench-dacapo-timing-hwloc} { name: "bench-compiler-dacapo-timing-linux-x52" } - ${x52.tmpfs10g} ${bench-dacapo-move-profiling-hwloc} { name: "bench-compiler-dacapo-move-profiling-linux-x52" } - ${x52.tmpfs10g} ${bench-scala-dacapo-hwloc} { name: "bench-compiler-scala-dacapo-linux-x52" } - ${x52.tmpfs10g} ${bench-scala-dacapo-timing-hwloc} { name: "bench-compiler-scala-dacapo-timing-linux-x52" } - ${x52.tmpfs10g} ${bench-scala-dacapo-move-profiling-hwloc} { name: "bench-compiler-scala-dacapo-move-profiling-linux-x52" } - ${x52.default} ${bench-specjvm2008-Single} { name: "bench-compiler-specjvm2008-Single-linux-x52" } - ${x52.default} ${bench-specjvm2008-OneVM} { name: "bench-compiler-specjvm2008-OneVM-linux-x52" } - ${x52.default} ${bench-specjbb2015} { name: "bench-compiler-specjbb2015-linux-x52" } - ${x52.default} ${bench-micros-graal} { name: "bench-compiler-jmh-micros-graal-linux-x52" } + ${x52.tmpfs10g} ${bench-dacapo-hwloc} ${openjdk8} { name: "bench-compiler-dacapo-linux-x52" } + ${x52.tmpfs10g} ${bench-dacapo-timing-hwloc} ${openjdk8} { name: "bench-compiler-dacapo-timing-linux-x52" } + ${x52.tmpfs10g} ${bench-dacapo-move-profiling-hwloc} ${openjdk8} { name: "bench-compiler-dacapo-move-profiling-linux-x52" } + ${x52.tmpfs10g} ${bench-scala-dacapo-hwloc} ${openjdk8} { name: "bench-compiler-scala-dacapo-linux-x52" } + ${x52.tmpfs10g} ${bench-scala-dacapo-timing-hwloc} ${openjdk8} { name: "bench-compiler-scala-dacapo-timing-linux-x52" } + ${x52.tmpfs10g} ${bench-scala-dacapo-move-profiling-hwloc} ${openjdk8} { name: "bench-compiler-scala-dacapo-move-profiling-linux-x52" } + ${x52.default} ${bench-specjvm2008-Single} ${openjdk8} { name: "bench-compiler-specjvm2008-Single-linux-x52" } + ${x52.default} ${bench-specjvm2008-OneVM} ${openjdk8} { name: "bench-compiler-specjvm2008-OneVM-linux-x52" } + ${x52.default} ${bench-specjbb2015} ${openjdk8} { name: "bench-compiler-specjbb2015-linux-x52" } + ${x52.default} ${bench-micros-graal} ${openjdk8} { name: "bench-compiler-jmh-micros-graal-linux-x52" } - ${x52.tmpfs10g-g1gc} ${bench-dacapo-hwloc} { targets : [weekly, bench], name: "bench-compiler-dacapo-g1gc-linux-x52" } - ${x52.tmpfs10g-g1gc} ${bench-scala-dacapo-hwloc} { targets : [weekly, bench], name: "bench-compiler-scala-dacapo-g1gc-linux-x52" } - ${x52.tmpfs10g-g1gc} ${bench-specjvm2008-Single} { targets : [weekly, bench], name: "bench-compiler-specjvm2008-g1gc-Single-linux-x52" } - ${x52.tmpfs10g-g1gc} ${bench-specjbb2015} { targets : [weekly, bench], name: "bench-compiler-specjbb2015-g1gc-linux-x52" } + ${x52.tmpfs10g-g1gc} ${bench-dacapo-hwloc} ${openjdk8} { targets : [weekly, bench], name: "bench-compiler-dacapo-g1gc-linux-x52" } + ${x52.tmpfs10g-g1gc} ${bench-scala-dacapo-hwloc} ${openjdk8} { targets : [weekly, bench], name: "bench-compiler-scala-dacapo-g1gc-linux-x52" } + ${x52.tmpfs10g-g1gc} ${bench-specjvm2008-Single} ${openjdk8} { targets : [weekly, bench], name: "bench-compiler-specjvm2008-g1gc-Single-linux-x52" } + ${x52.tmpfs10g-g1gc} ${bench-specjbb2015} ${openjdk8} { targets : [weekly, bench], name: "bench-compiler-specjbb2015-g1gc-linux-x52" } ] diff --git a/examples/ci.hocon b/examples/ci.hocon index 0f7d52ce95c0..d90abe9c2987 100644 --- a/examples/ci.hocon +++ b/examples/ci.hocon @@ -13,8 +13,8 @@ examplesGate : ${examplesCommon} { } builds += [ - ${linux-amd64} ${java8} ${examplesGate} ${eclipse} ${jdt} { name: "gate-examples-linux-8" }, - ${linux-amd64} ${java9} ${examplesGate} ${eclipse} { name: "gate-examples-linux-9" }, - ${solaris-sparcv9} ${java8} ${examplesGate} { name: "gate-examples-solaris-8" }, - ${darwin-amd64} ${java8} ${examplesGate} { name: "gate-examples-darwin-8" }, + ${linux-amd64} ${openjdk8} ${examplesGate} ${eclipse} ${jdt} { name: "gate-examples-linux-8" }, + ${linux-amd64} ${labsjdk9} ${examplesGate} ${eclipse} { name: "gate-examples-linux-9" }, + ${solaris-sparcv9} ${labsjdk8} ${examplesGate} { name: "gate-examples-solaris-8" }, + ${darwin-amd64} ${labsjdk8} ${examplesGate} { name: "gate-examples-darwin-8" }, ] diff --git a/sdk/ci.hocon b/sdk/ci.hocon index 1945244d1a13..382c3e30c763 100644 --- a/sdk/ci.hocon +++ b/sdk/ci.hocon @@ -13,8 +13,8 @@ sdkGate : ${sdkCommon} { } builds += [ - ${linux-amd64} ${java8} ${sdkGate} ${eclipse} ${jdt} { name: "gate-sdk-linux-8" }, - ${linux-amd64} ${java9} ${sdkGate} ${eclipse} { name: "gate-sdk-linux-9" }, - ${solaris-sparcv9} ${java8} ${sdkGate} { name: "gate-sdk-solaris-8" }, - ${darwin-amd64} ${java8} ${sdkGate} { name: "gate-sdk-darwin-8" }, + ${linux-amd64} ${openjdk8} ${sdkGate} ${eclipse} ${jdt} { name: "gate-sdk-linux-8" }, + ${linux-amd64} ${labsjdk9} ${sdkGate} ${eclipse} { name: "gate-sdk-linux-9" }, + ${solaris-sparcv9} ${labsjdk8} ${sdkGate} { name: "gate-sdk-solaris-8" }, + ${darwin-amd64} ${labsjdk8} ${sdkGate} { name: "gate-sdk-darwin-8" }, ] diff --git a/truffle/ci.hocon b/truffle/ci.hocon index cd343c58cefc..38a12ff7cbac 100644 --- a/truffle/ci.hocon +++ b/truffle/ci.hocon @@ -13,9 +13,9 @@ gateLite : ${truffleCommon} { } builds += [ - ${linux-amd64} ${java8} ${truffleCommon} ${eclipse} ${jdt} {run : [["mx", "--strict-compliance", "gate", "--strict-mode"]], targets : [gate], name: "gate-truffle-8"}, - ${linux-amd64} ${java9} ${truffleCommon} ${eclipse} {run : [["mx", "--strict-compliance", "gate", "--strict-mode"]], targets : [gate], name: "gate-truffle-9"}, - ${linux-amd64} ${java8} ${truffleCommon} { + ${linux-amd64} ${openjdk8} ${truffleCommon} ${eclipse} ${jdt} {run : [["mx", "--strict-compliance", "gate", "--strict-mode"]], targets : [gate], name: "gate-truffle-8"}, + ${linux-amd64} ${labsjdk9} ${truffleCommon} ${eclipse} {run : [["mx", "--strict-compliance", "gate", "--strict-mode"]], targets : [gate], name: "gate-truffle-9"}, + ${linux-amd64} ${openjdk8} ${truffleCommon} { run : [ ["mx", "build"], ["mx", "javadoc"], @@ -24,23 +24,23 @@ builds += [ name: "gate-truffle-javadoc" }, ${linux-amd64} ${linux-deploy} ${maven-deploy-dry-run} ${truffleCommon} {name: "gate-truffle-maven-dry-run"} - ${solaris-sparcv9} ${java8} ${gateLite} { + ${solaris-sparcv9} ${labsjdk8} ${gateLite} { targets : [ weekly ], name: "gate-truffle-solaris-lite-8" } - ${solaris-sparcv9} ${java9} ${gateLite} { + ${solaris-sparcv9} ${labsjdk9} ${gateLite} { targets : [ weekly ], name: "gate-truffle-solaris-lite-9" } - ${darwin-amd64} ${java8} ${gateLite} { + ${darwin-amd64} ${labsjdk8} ${gateLite} { targets : [ weekly ], name: "gate-truffle-mac-lite-8" } - ${darwin-amd64} ${java9} ${gateLite} { + ${darwin-amd64} ${labsjdk9} ${gateLite} { targets : [ weekly ], name: "gate-truffle-mac-lite-9" } - ${linux-amd64} ${java8} ${truffleCommon} { + ${linux-amd64} ${openjdk8} ${truffleCommon} { run : [ ["mx", "build"], ["mx", "javadoc"],