Add java16

eclipse-capella · Jun 21, 2021 · f8c0bb1 · f8c0bb1
1 parent 8859f5f
commit f8c0bb1
Show file tree

Hide file tree

Showing 3 changed files with 49 additions and 5 deletions.
diff --git a/resources/podTemplates/ui-test-agent-3.29.yaml b/resources/podTemplates/ui-test-agent-3.29.yaml
@@ -2,7 +2,7 @@ apiVersion: v1
 kind: Pod
 spec:
   containers:
-  - name: uitests
+  - name: capella-agent
     image: eclipsecbijenkins/ui-test-agent:3.29
     tty: true
     command: [ "uid_entrypoint", "cat" ]

diff --git a/vars/downloader.groovy b/vars/downloader.groovy
@@ -38,6 +38,50 @@ def downloadMacJDK(jdkMacFolder) {
 	sh "tar xzf ${jdkMacTar} -C ${jdkMacFolder}"
 	sh "mv ${jdkMacFolder}/${jdk}.jdk ${jdkMacFolder}/jre"
 
+  println "Mac JDK downloaded to ${jdkMacFolder}/jre"
+	sh "ls ${jdkMacFolder}/jre"
+}
+
+def downloadWindowsJDK16(jdkWinFolder) {
+	def jdk = 'jdk-16.0.1'
+
+  def jdkWinURL = 'https://download.java.net/java/GA/jdk16.0.1/7147401fd7354114ac51ef3e1328291f/9/GPL/openjdk-16.0.1_windows-x64_bin.zip'
+  def jdkWinZip = 'jdkWin.zip'	
+
+	sh "curl -k -o ${jdkWinZip} ${jdkWinURL}"
+	sh "unzip -q ${jdkWinZip} -d ${jdkWinFolder}"
+	sh "mv ${jdkWinFolder}/${jdk} ${jdkWinFolder}/jre"        
+
+  println "Windows JDK dowloaded to ${jdkWinFolder}/jre"
+  sh "ls ${jdkWinFolder}/jre"
+}
+
+def downloadLinuxJDK16(jdkLinuxFolder) {
+	def jdk = 'jdk-16.0.1'
+
+  def jdkLinuxURL = 'https://download.java.net/java/GA/jdk16.0.1/7147401fd7354114ac51ef3e1328291f/9/GPL/openjdk-16.0.1_linux-x64_bin.tar.gz'
+  def jdkLinuxTar = 'jdkLinux.tar.gz'
+
+	sh "curl -k -o ${jdkLinuxTar} ${jdkLinuxURL}"
+	sh "mkdir ${jdkLinuxFolder}"
+  sh "tar xzf ${jdkLinuxTar} -C ${jdkLinuxFolder}"
+	sh "mv ${jdkLinuxFolder}/${jdk} ${jdkLinuxFolder}/jre"
+
+  println "Linux JDK downloaded to ${jdkLinuxFolder}/jre"    
+	sh "ls ${jdkLinuxFolder}/jre"
+}
+
+def downloadMacJDK16(jdkMacFolder) {
+	def jdk = 'jdk-16.0.1'
+
+  def jdkMacURL = 'https://download.java.net/java/GA/jdk16.0.1/7147401fd7354114ac51ef3e1328291f/9/GPL/openjdk-16.0.1_osx-x64_bin.tar.gz'
+  def jdkMacTar = 'jdkMac.tar.gz'
+
+	sh "curl -k -o ${jdkMacTar} ${jdkMacURL}"
+	sh "mkdir ${jdkMacFolder}"
+	sh "tar xzf ${jdkMacTar} -C ${jdkMacFolder}"
+	sh "mv ${jdkMacFolder}/${jdk}.jdk ${jdkMacFolder}/jre"
+
   println "Mac JDK downloaded to ${jdkMacFolder}/jre"
 	sh "ls ${jdkMacFolder}/jre"
 }
diff --git a/vars/tester.groovy b/vars/tester.groovy
@@ -1,5 +1,5 @@
 private def downloadJacocoIfNeeded() {
-    def jacoURL = 'https://repo1.maven.org/maven2/org/jacoco/jacoco/0.8.6/jacoco-0.8.6.zip'
+    def jacoURL = 'https://repo1.maven.org/maven2/org/jacoco/jacoco/0.8.7/jacoco-0.8.7.zip'
     def jacoZip = 'jacoco.zip'
     sh """
         if [ ! -d ${WORKSPACE}/jacoco ]; then
@@ -12,11 +12,11 @@ private def downloadJacocoIfNeeded() {
 }
 
 def generateJacocoReport() {
-    sh "mvn -Djacoco.dataFile=${WORKSPACE}/jacoco.exec org.jacoco:jacoco-maven-plugin:0.8.6:report"
+    sh "mvn -Djacoco.dataFile=${WORKSPACE}/jacoco.exec org.jacoco:jacoco-maven-plugin:0.8.7:report"
 }
 
 def prepareJacocoAgentSteps() {
-    return " -Djacoco.destFile=${WORKSPACE}/jacoco.exec -Djacoco.append=true org.jacoco:jacoco-maven-plugin:0.8.6:prepare-agent "
+    return " -Djacoco.destFile=${WORKSPACE}/jacoco.exec -Djacoco.append=true org.jacoco:jacoco-maven-plugin:0.8.7:prepare-agent "
 }
 
 def runRcptt(String mvnProfile) {
@@ -50,7 +50,7 @@ private def getJunitCmdTemplate(String capellaProductPath, String applicationPar
   return "sleep 10 && " +
     "java " +
       "${jacocoParameters}" +
-      "-Xms1024m -Xmx3500m -XX:+CMSClassUnloadingEnabled " +
+      "-Xms1024m -Xmx3500m " +
       "-ea -da:org.eclipse.emf.common.util.URI " + // bug GMF 438712
       "-Declipse.p2.data.area=@config.dir/../p2 " +
       "-Dfile.encoding=Cp1252 " +