Remove jdk9/jdk10 and add jdk11 based on snapshot

robmusial · Jun 29, 2018 · 3b861c6 · 3b861c6
1 parent 4c11eba
commit 3b861c6
Show file tree

Hide file tree

Showing 8 changed files with 21 additions and 61 deletions.
diff --git a/common.hocon b/common.hocon
@@ -9,8 +9,7 @@ jdks: {
   labsjdk8:      {name : labsjdk,   version : "8u172-jvmci-0.46-dev", platformspecific: true}
   openjdk8:      {name : openjdk,   version : "8u172-jvmci-0.46-dev", platformspecific: true}
   labsjdk8Debug: {name : labsjdk,   version : "8u172-jvmci-0.46-dev-fastdebug", platformspecific: true}
-  oraclejdk9:    {name : oraclejdk, version : "9.0.4+11", platformspecific: true}
-  oraclejdk10:   {name : oraclejdk, version : "10+46", platformspecific: true}
+  oraclejdk11:   {name : labsjdk,   version : "20180627-111552-dev", platformspecific: true}
 
   # Snapshot of http://hg.openjdk.java.net/jdk/jdk
   oraclejdkSNAPSHOT : {name : labsjdk, version : "20180627-111552-dev", platformspecific: true}
@@ -25,14 +24,12 @@ mx : {
   }
 }
 
-labsjdk8 :      { downloads : { JAVA_HOME : ${jdks.labsjdk8},      EXTRA_JAVA_HOMES : { pathlist :[ ${jdks.oraclejdk9} ]} }}
-labsjdk8Debug : { downloads : { JAVA_HOME : ${jdks.labsjdk8Debug}, EXTRA_JAVA_HOMES : { pathlist :[ ${jdks.oraclejdk9} ]} }}
+labsjdk8 :      { downloads : { JAVA_HOME : ${jdks.labsjdk8},      EXTRA_JAVA_HOMES : { pathlist :[ ${jdks.oraclejdk11} ]} }}
+labsjdk8Debug : { downloads : { JAVA_HOME : ${jdks.labsjdk8Debug}, EXTRA_JAVA_HOMES : { pathlist :[ ${jdks.oraclejdk11} ]} }}
 
 openjdk8 :        { downloads : { JAVA_HOME : ${jdks.openjdk8} }}
 
-oraclejdk9 :      { downloads : { JAVA_HOME : ${jdks.oraclejdk9},        EXTRA_JAVA_HOMES : { pathlist :[ ${jdks.labsjdk8} ]} }}
-oraclejdk10 :     { downloads : { JAVA_HOME : ${jdks.oraclejdk10},       EXTRA_JAVA_HOMES : { pathlist :[ ${jdks.labsjdk8}, ${jdks.oraclejdk9} ]} }}
-oraclejdk11 :     { downloads : { JAVA_HOME : ${jdks.oraclejdkSNAPSHOT}, EXTRA_JAVA_HOMES : { pathlist :[ ${jdks.labsjdk8}, ${jdks.oraclejdk10} ]} }}
+oraclejdk11 :     { downloads : { JAVA_HOME : ${jdks.oraclejdk11}, EXTRA_JAVA_HOMES : { pathlist :[ ${jdks.labsjdk8} ]} }}
 
 common : ${mx} {
   timelimit : "30:00"

diff --git a/compiler/ci_common/gate_tasks.hocon b/compiler/ci_common/gate_tasks.hocon
@@ -4,23 +4,17 @@ builds += [
   # Darwin AMD64
   ${gateTest}           ${labsjdk8}    ${gateDarwinAMD64}  {name: "weekly-test-compiler-test-8-darwin-amd64"} ${graalWeekly}
   ${gateTest}           ${openjdk8}    ${gateDarwinAMD64}  {name: "weekly-test-compiler-test-openjdk8-darwin-amd64"} ${graalWeekly}
-  ${gateTest}           ${oraclejdk9}  ${gateDarwinAMD64}  {name: "weekly-test-compiler-test-9-darwin-amd64"} ${graalWeekly}
-  ${gateTest}           ${oraclejdk10} ${gateDarwinAMD64}  {name: "weekly-test-compiler-test-10-darwin-amd64"} ${graalWeekly}
   ${gateTest}           ${oraclejdk11} ${gateDarwinAMD64}  {name: "weekly-test-compiler-test-11-darwin-amd64"} ${graalWeekly}
 # ${gateTestBenchmark}  ${labsjdk8}    ${gateDarwinAMD64}  {name: "weekly-test-compiler-benchmarktest-8-darwin-amd64"} ${graalWeekly}
 
   # Linux AMD64
   ${gateTest}          ${labsjdk8}       ${gateLinuxAMD64}   {name: "gate-compiler-test-8-linux-amd64"}
   ${gateTest}          ${openjdk8}       ${gateLinuxAMD64}   {name: "weekly-test-compiler-test-openjdk8-linux-amd64"} ${graalWeekly}
   ${gateTestMaxVS}     ${labsjdk8}       ${gateLinuxAMD64}   {name: "weekly-test-compiler-test-8-linux-amd64-maxvectorsize"} ${graalWeekly}
-  ${gateTest}          ${oraclejdk9}     ${gateLinuxAMD64}   {name: "weekly-test-compiler-test-9-linux-amd64"} ${graalWeekly} {capabilities: ${gateLinuxAMD64.capabilities} ["!x4150"]}
-  ${gateTest}          ${oraclejdk10}    ${gateLinuxAMD64}   {name: "weekly-test-compiler-test-10-linux-amd64"} ${graalWeekly} {capabilities: ${gateLinuxAMD64.capabilities} ["!x4150"]}
   ${gateTest}          ${oraclejdk11}    ${gateLinuxAMD64}   {name: "gate-compiler-test-11-linux-amd64"} {capabilities: ${gateLinuxAMD64.capabilities} ["!x4150"]}
   ${gateJavaBaseTest}  ${oraclejdk11}    ${gateLinuxAMD64}   {name: "weekly-test-compiler-javabasetest-11-linux-amd64"} ${graalWeekly} {capabilities: ${gateLinuxAMD64.capabilities} ["!x4150"]}
   ${gateTestCTW}       ${labsjdk8}       ${gateLinuxAMD64}   {name: "gate-compiler-ctw-8-linux-amd64"}
   ${gateTestCTW}       ${openjdk8}       ${gateLinuxAMD64}   {name: "weekly-test-compiler-ctw-openjdk8-linux-amd64"} ${graalWeekly}
-  ${gateTestCTW}       ${oraclejdk9}     ${gateLinuxAMD64}   {name: "weekly-test-compiler-ctw-9-linux-amd64"} ${graalWeekly}
-  ${gateTestCTW}       ${oraclejdk10}    ${gateLinuxAMD64}   {name: "weekly-test-compiler-ctw-10-linux-amd64"} ${graalWeekly}
   ${gateTestCTW}       ${oraclejdk11}    ${gateLinuxAMD64}   {name: "weekly-test-compiler-ctw-11-linux-amd64"} ${graalWeekly}
   ${gateTest}          ${labsjdk8Debug}  ${gateLinuxAMD64}   {name: "weekly-test-compiler-test-8-linux-amd64-fastdebug", timelimit: "1:50:00"} ${graalWeekly}
   ${gateTestBenchmark} ${labsjdk8}       ${gateLinuxAMD64}   {name: "gate-compiler-benchmarktest-8-linux-amd64"}
@@ -29,12 +23,8 @@ builds += [
 
   # Solaris SPARC
   ${gateTest}          ${labsjdk8}       ${gateSolarisSPARC} {name: "gate-compiler-test-8-solaris-sparcv9",                    timelimit: "1:00:00"}
-  ${gateTest}          ${oraclejdk9}     ${gateSolarisSPARC} {name: "weekly-test-compiler-test-9-solaris-sparcv9",             timelimit: "1:50:00"} ${graalWeekly}
-  ${gateTest}          ${oraclejdk10}    ${gateSolarisSPARC} {name: "weekly-test-compiler-test-10-solaris-sparcv9",            timelimit: "1:50:00"} ${graalWeekly}
   ${gateTest}          ${oraclejdk11}    ${gateSolarisSPARC} {name: "gate-compiler-test-11-solaris-sparcv9",                   timelimit: "1:00:00"}
   ${gateTestCTW}       ${labsjdk8}       ${gateSolarisSPARC} {name: "gate-compiler-ctw-8-solaris-sparcv9",                     timelimit: "1:00:00"}
-  ${gateTestCTW}       ${oraclejdk9}     ${gateSolarisSPARC} {name: "weekly-test-compiler-ctw-9-solaris-sparcv9",              timelimit: "1:50:00"} ${graalWeekly}
-  ${gateTestCTW}       ${oraclejdk10}    ${gateSolarisSPARC} {name: "weekly-test-compiler-ctw-10-solaris-sparcv9",             timelimit: "1:50:00"} ${graalWeekly}
   ${gateTestCTW}       ${oraclejdk11}    ${gateSolarisSPARC} {name: "weekly-test-compiler-ctw-11-solaris-sparcv9",             timelimit: "1:50:00"} ${graalWeekly}
   ${gateTest}          ${labsjdk8Debug}  ${gateSolarisSPARC} {name: "weekly-test-compiler-test-8-solaris-sparcv9-fastdebug",   timelimit: "1:50:00"} ${graalWeekly}
   ${gateTestBenchmark} ${labsjdk8}       ${gateSolarisSPARC} {name: "gate-compiler-benchmarktest-8-solaris-sparcv9",           timelimit: "1:00:00"}

diff --git a/compiler/ci_common/gate_tasks_bootstrap.hocon b/compiler/ci_common/gate_tasks_bootstrap.hocon
@@ -2,21 +2,16 @@
 builds += [
   # Darwin AMD64
   ${gateBootstrapLite}       ${labsjdk8}    ${gateDarwinAMD64Bootstrap}  {name: "gate-compiler-bootstraplite-8-darwin-amd64"}
-  ${gateBootstrapLite}       ${oraclejdk9}  ${gateDarwinAMD64Bootstrap}  {name: "weekly-test-compiler-bootstraplite-9-darwin-amd64"} ${graalWeekly}
-  ${gateBootstrapLite}       ${oraclejdk10} ${gateDarwinAMD64Bootstrap}  {name: "weekly-test-compiler-bootstraplite-10-darwin-amd64"} ${graalWeekly}
   ${gateBootstrapLite}       ${oraclejdk11} ${gateDarwinAMD64Bootstrap}  {name: "weekly-test-compiler-bootstraplite-11-darwin-amd64"} ${graalWeekly}
 
   # Linux AMD64
   ${gateBootstrap}           ${labsjdk8}    ${gateLinuxAMD64Bootstrap}   {name: "gate-compiler-bootstrap-8-linux-amd64"}
   ${gateBootstrapFullVerify} ${labsjdk8}    ${gateLinuxAMD64Bootstrap}   {name: "gate-compiler-bootstrapfullverify-8-linux-amd64"}
-  ${gateBootstrap}           ${oraclejdk9}  ${gateLinuxAMD64Bootstrap}   {name: "weekly-test-compiler-bootstrap-9-linux-amd64"} ${graalWeekly}
-  ${gateBootstrap}           ${oraclejdk10} ${gateLinuxAMD64Bootstrap}   {name: "weekly-test-compiler-bootstrap-10-linux-amd64"} ${graalWeekly}
   ${gateBootstrap}           ${oraclejdk11} ${gateLinuxAMD64Bootstrap}   {name: "gate-compiler-bootstrap-11-linux-amd64"}
 
   # Solaris SPARC
   ${gateBootstrap}           ${labsjdk8}    ${gateSolarisSPARCBootstrap} {name: "gate-compiler-bootstrap-8-solaris-sparcv9",   timelimit: "1:00:00"}
-  ${gateBootstrap}           ${oraclejdk9}  ${gateSolarisSPARCBootstrap} {name: "weekly-test-compiler-bootstrap-9-solaris-sparcv9",   timelimit: "1:00:00"} ${graalWeekly}
-  ${gateBootstrap}           ${oraclejdk10} ${gateSolarisSPARCBootstrap} {name: "weekly-test-compiler-bootstrap-10-solaris-sparcv9",  timelimit: "1:00:00"} ${graalWeekly}
+  ${gateBootstrap}           ${oraclejdk11} ${gateSolarisSPARCBootstrap} {name: "weekly-test-compiler-bootstrap-11-solaris-sparcv9",  timelimit: "1:00:00"} ${graalWeekly}
 
   # Linux SPARC
   ${gateBootstrap}           ${labsjdk8}   ${gateLinuxSPARCBootstrap} {name: "weekly-test-compiler-bootstrap-labsjdk8-linux-sparcv9", timelimit: "1:00:00"} ${graalWeekly}

diff --git a/examples/ci.hocon b/examples/ci.hocon
@@ -14,8 +14,7 @@ examplesGate : ${examplesCommon} {
 
 builds += [
   ${linux-amd64}     ${labsjdk8}    ${examplesGate} ${eclipse} ${jdt} { name: "gate-examples-linux-8"   },
-  ${linux-amd64}     ${oraclejdk9}  ${examplesGate} ${eclipse}        { name: "gate-examples-linux-9"   },
-  ${linux-amd64}     ${oraclejdk10} ${examplesGate} ${eclipse}        { name: "gate-examples-linux-10"   },
+  ${linux-amd64}     ${oraclejdk11} ${examplesGate} ${eclipse}        { name: "gate-examples-linux-11"  },
   ${solaris-sparcv9} ${labsjdk8}    ${examplesGate}                   { name: "gate-examples-solaris-8" },
   ${darwin-amd64}    ${labsjdk8}    ${examplesGate}                   { name: "gate-examples-darwin-8"  },
 ]
diff --git a/regex/ci.hocon b/regex/ci.hocon
@@ -18,24 +18,17 @@ regexWeekly: ${regex-weekly-notifications} {
 
 builds += [
   ${linux-amd64} ${labsjdk8}    ${regexCommon} ${eclipse} ${jdt} {run : [["mx", "--strict-compliance", "gate", "--strict-mode"]], targets : [gate], name: "gate-regex-8"},
-  ${linux-amd64} ${oraclejdk9}  ${regexCommon} ${eclipse} {run : [["mx", "--strict-compliance", "gate", "--strict-mode"]], targets : [gate], name: "gate-regex-9"},
-  ${linux-amd64} ${oraclejdk10} ${regexCommon} ${eclipse} {run : [["mx", "--strict-compliance", "gate", "--strict-mode"]], targets : [gate], name: "gate-regex-10"},
+  ${linux-amd64} ${oraclejdk11}  ${regexCommon} ${eclipse} {run : [["mx", "--strict-compliance", "gate", "--strict-mode"]], targets : [gate], name: "gate-regex-11"},
   ${solaris-sparcv9} ${labsjdk8} ${gateLite} ${regexWeekly} {
     name: "gate-regex-solaris-lite-8"
   }
-  ${solaris-sparcv9} ${oraclejdk9} ${gateLite} ${regexWeekly} {
-    name: "gate-regex-solaris-lite-9"
-  }
-  ${solaris-sparcv9} ${oraclejdk10} ${gateLite} ${regexWeekly} {
-    name: "gate-regex-solaris-lite-10"
+  ${solaris-sparcv9} ${oraclejdk11} ${gateLite} ${regexWeekly} {
+    name: "gate-regex-solaris-lite-11"
   }
   ${darwin-amd64} ${labsjdk8} ${gateLite} ${regexWeekly} {
     name: "gate-regex-mac-lite-8"
   }
-  ${darwin-amd64} ${oraclejdk9} ${gateLite} ${regexWeekly} {
-    name: "gate-regex-mac-lite-9"
-  }
-  ${darwin-amd64} ${oraclejdk10} ${gateLite} ${regexWeekly} {
-    name: "gate-regex-mac-lite-10"
+  ${darwin-amd64} ${oraclejdk11} ${gateLite} ${regexWeekly} {
+    name: "gate-regex-mac-lite-11"
   }
 ]
diff --git a/sdk/ci.hocon b/sdk/ci.hocon
@@ -14,7 +14,7 @@ sdkGate : ${sdkCommon} {
 
 builds += [
   ${linux-amd64}     ${labsjdk8}    ${sdkGate} ${eclipse} ${jdt} { name: "gate-sdk-linux-8"   },
-  ${linux-amd64}     ${oraclejdk9}  ${sdkGate} ${eclipse}        { name: "gate-sdk-linux-9"   },
+  ${linux-amd64}     ${oraclejdk11}  ${sdkGate} ${eclipse}        { name: "gate-sdk-linux-9"   },
   ${linux-amd64}     ${oraclejdk11} ${sdkGate} ${eclipse}        { name: "gate-sdk-linux-11"  },
   ${solaris-sparcv9} ${labsjdk8}    ${sdkGate}                   { name: "gate-sdk-solaris-8" },
   ${darwin-amd64}    ${labsjdk8}    ${sdkGate}                   { name: "gate-sdk-darwin-8"  },

diff --git a/tools/ci.hocon b/tools/ci.hocon
@@ -18,7 +18,6 @@ toolsWeekly: ${tools-weekly-notifications} {
 
 builds += [
   ${linux-amd64} ${labsjdk8}    ${toolsCommon} ${eclipse} ${jdt} {run : [["mx", "--strict-compliance", "gate", "--strict-mode"]], targets : [gate], name: "gate-tools-8"},
-  ${linux-amd64} ${oraclejdk9}  ${toolsCommon} ${eclipse} {run : [["mx", "--strict-compliance", "gate", "--strict-mode"]], targets : [gate], name: "gate-tools-9"},
   ${linux-amd64} ${oraclejdk11} ${toolsCommon} ${eclipse} {run : [["mx", "--strict-compliance", "gate", "--strict-mode"]], targets : [gate], name: "gate-tools-11"},
   ${linux-amd64} ${labsjdk8}    ${toolsCommon} {
     run : [
@@ -31,19 +30,13 @@ builds += [
   ${solaris-sparcv9} ${labsjdk8} ${toolsGateLite} ${toolsWeekly} {
     name: "gate-tools-solaris-lite-8"
   }
-  ${solaris-sparcv9} ${oraclejdk9} ${toolsGateLite} ${toolsWeekly} {
-    name: "gate-tools-solaris-lite-9"
-  }
-  ${solaris-sparcv9} ${oraclejdk10} ${toolsGateLite} ${toolsWeekly} {
-    name: "gate-tools-solaris-lite-10"
+  ${solaris-sparcv9} ${oraclejdk11} ${toolsGateLite} ${toolsWeekly} {
+    name: "gate-tools-solaris-lite-11"
   }
   ${darwin-amd64} ${labsjdk8} ${toolsGateLite} ${toolsWeekly} {
     name: "gate-tools-mac-lite-8"
   }
-  ${darwin-amd64} ${oraclejdk9} ${toolsGateLite} ${toolsWeekly} {
-    name: "gate-tools-mac-lite-9"
-  }
-  ${darwin-amd64} ${oraclejdk10} ${toolsGateLite} ${toolsWeekly} {
-    name: "gate-tools-mac-lite-10"
+  ${darwin-amd64} ${oraclejdk11} ${toolsGateLite} ${toolsWeekly} {
+    name: "gate-tools-mac-lite-11"
   }
 ]
diff --git a/truffle/ci.hocon b/truffle/ci.hocon
@@ -33,8 +33,7 @@ truffleWeekly: ${truffle-weekly-notifications} {
 
 builds += [
   ${linux-amd64} ${labsjdk8}    ${truffleCommon} ${eclipse} ${jdt} {run : [["mx", "--strict-compliance", "gate", "--strict-mode"]], targets : [gate], name: "gate-truffle-8"},
-  ${linux-amd64} ${oraclejdk9}  ${truffleCommon} ${eclipse} {run : [["mx", "--strict-compliance", "gate", "--strict-mode"]], targets : [gate], name: "gate-truffle-9"},
-  ${linux-amd64} ${oraclejdk10} ${truffleCommon} ${eclipse} {run : [["mx", "--strict-compliance", "gate", "--strict-mode"]], targets : [gate], name: "gate-truffle-10"},
+  ${linux-amd64} ${oraclejdk11}  ${truffleCommon} ${eclipse} {run : [["mx", "--strict-compliance", "gate", "--strict-mode"]], targets : [gate], name: "gate-truffle-11"},
   ${linux-amd64} ${labsjdk8}    ${truffleCommon} {
     run : [
         ["mx", "build"],
@@ -47,20 +46,14 @@ builds += [
   ${solaris-sparcv9} ${labsjdk8} ${gateLite} ${truffleWeekly} {
     name: "gate-truffle-solaris-lite-8"
   }
-  ${solaris-sparcv9} ${oraclejdk9} ${gateLite} ${truffleWeekly} {
-    name: "gate-truffle-solaris-lite-9"
-  }
-  ${solaris-sparcv9} ${oraclejdk10} ${gateLite} ${truffleWeekly} {
-    name: "gate-truffle-solaris-lite-10"
+  ${solaris-sparcv9} ${oraclejdk11} ${gateLite} ${truffleWeekly} {
+    name: "gate-truffle-solaris-lite-11"
   }
   ${darwin-amd64} ${labsjdk8} ${gateLite} ${truffleWeekly} {
     name: "gate-truffle-mac-lite-8"
   }
-  ${darwin-amd64} ${oraclejdk9} ${gateLite} ${truffleWeekly} {
-    name: "gate-truffle-mac-lite-9"
-  }
-  ${darwin-amd64} ${oraclejdk10} ${gateLite} ${truffleWeekly} {
-    name: "gate-truffle-mac-lite-10"
+  ${darwin-amd64} ${oraclejdk11} ${gateLite} ${truffleWeekly} {
+    name: "gate-truffle-mac-lite-11"
   }
   # BENCHMARKS
   ${benchCommon} ${truffle-bench-notifications} {