JDK21 runs of standalone TCKs.

Signed-off-by: Gurunandan Rao <gurunandan.rao@oracle.com>
jakartaee · Apr 25, 2024 · 1ccf576 · 1ccf576
1 parent b587cc0
commit 1ccf576
Show file tree

Hide file tree

Showing 7 changed files with 57 additions and 20 deletions.
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -182,8 +182,8 @@ spec:
            description: 'List of standalone TCK bundle file names to be appended to the base url' )
     choice(name: 'PROFILE', choices: 'FULL\nWEB', 
            description: 'Profile to be used for running CTS either web/full' )
-    choice(name: 'JDK', choices: 'JDK11\nJDK17',
-           description: 'Java SE Version to be used for running TCK either JDK11/JDK17' )
+    choice(name: 'JDK', choices: 'JDK11\nJDK17\nJDK21',
+           description: 'Java SE Version to be used for running TCK either JDK11/JDK17/JDK21' )
     choice(name: 'LICENSE', choices: 'EPL\nEFTL',
            description: 'License file to be used to build the TCK bundle(s) either EPL(default) or Eclipse Foundation TCK License' )
     choice(name: 'AS_TRACE', choices: 'false\ntrue',

diff --git a/docker/connectortck.sh b/docker/connectortck.sh
@@ -1,6 +1,6 @@
 #!/bin/bash -xe
 
-# Copyright (c) 2018, 2022 Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2018, 2024 Oracle and/or its affiliates. All rights reserved.
 #
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License v. 2.0, which is available at
@@ -54,16 +54,21 @@ echo "TS_HOME $TS_HOME"
 
 chmod -R 777 $TS_HOME
 
-cd $TS_HOME/bin
+cd $WORKSPACE
 
 if [[ "$JDK" == "JDK17" || "$JDK" == "jdk17" ]];then
   export JAVA_HOME=${JDK17_HOME}
-fi
+elif [[ "$JDK" == "JDK21" || "$JDK" == "jdk21" ]];then
+  wget https://download.java.net/java/GA/jdk21.0.1/415e3f918a1f4062a0074a2794853d0d/12/GPL/openjdk-21.0.1_linux-x64_bin.tar.gz -O jdk-21.tar.gz
+  tar -xvf jdk-21.tar.gz
+  export JAVA_HOME=$WORKSPACE/jdk-21.0.1
+fi  
 export PATH=$JAVA_HOME/bin:$PATH
 
 which java
 java -version
 
+cd $TS_HOME/bin
 
 
 sed -i.bak "s#^connector.home=.*#connector.home=$TCK_HOME/$GF_TOPLEVEL_DIR/glassfish#g" ts.jte

diff --git a/docker/jaxwstck.sh b/docker/jaxwstck.sh
@@ -1,6 +1,6 @@
 #!/bin/bash -x
 
-# Copyright (c) 2018, 2022 Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2018, 2024 Oracle and/or its affiliates. All rights reserved.
 #
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License v. 2.0, which is available at
@@ -54,11 +54,15 @@ TS_HOME=$TCK_HOME/$TCK_NAME
 echo "TS_HOME $TS_HOME"
 
 chmod -R 777 $TS_HOME
-cd $TS_HOME/bin
+cd $WORKSPACE
 
 if [[ "$JDK" == "JDK17" || "$JDK" == "jdk17" ]];then
   export JAVA_HOME=${JDK17_HOME}
-fi
+elif [[ "$JDK" == "JDK21" || "$JDK" == "jdk21" ]];then
+  wget https://download.java.net/java/GA/jdk21.0.1/415e3f918a1f4062a0074a2794853d0d/12/GPL/openjdk-21.0.1_linux-x64_bin.tar.gz -O jdk-21.tar.gz
+  tar -xvf jdk-21.tar.gz
+  export JAVA_HOME=$WORKSPACE/jdk-21.0.1
+fi  
 export PATH=$JAVA_HOME/bin:$PATH
 
 export ANT_OPTS="-Djavax.xml.accessExternalStylesheet=all -Djavax.xml.accessExternalSchema=all -Djavax.xml.accessExternalDTD=file,http,https"
@@ -67,6 +71,8 @@ export ANT_OPTS="-Djavax.xml.accessExternalStylesheet=all -Djavax.xml.accessExte
 which java
 java -version
 
+cd $TS_HOME/bin
+
 sed -i.bak "s#^webcontainer\.home=.*#webcontainer.home=$TCK_HOME/$GF_TOPLEVEL_DIR/glassfish#g" ts.jte
 sed -i.bak "s#webcontainer\.home\.ri=.*#webcontainer.home.ri=$TCK_HOME/ri/$GF_TOPLEVEL_DIR/glassfish#g" ts.jte
 sed -i.bak 's#webServerHost\.2=.*#webServerHost.2=localhost#g' ts.jte

diff --git a/docker/jmstck.sh b/docker/jmstck.sh
@@ -1,6 +1,6 @@
 #!/bin/bash -xe
 
-# Copyright (c) 2018, 2022 Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2018, 2024 Oracle and/or its affiliates. All rights reserved.
 #
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License v. 2.0, which is available at
@@ -52,16 +52,23 @@ echo "TS_HOME $TS_HOME"
 
 chmod -R 777 $TS_HOME
 
-cd $TS_HOME/bin
+cd $WORKSPACE
 
 if [[ "$JDK" == "JDK17" || "$JDK" == "jdk17" ]];then
   export JAVA_HOME=${JDK17_HOME}
-fi
+elif [[ "$JDK" == "JDK21" || "$JDK" == "jdk21" ]];then
+  wget https://download.java.net/java/GA/jdk21.0.1/415e3f918a1f4062a0074a2794853d0d/12/GPL/openjdk-21.0.1_linux-x64_bin.tar.gz -O jdk-21.tar.gz
+  tar -xvf jdk-21.tar.gz
+  export JAVA_HOME=$WORKSPACE/jdk-21.0.1
+fi  
 export PATH=$JAVA_HOME/bin:$PATH
 
 which java
 java -version
 
+cd $TS_HOME/bin
+
+
 sed -i.bak "s#^jms.home=.*#jms.home=$TCK_HOME/$GF_TOPLEVEL_DIR/mq#g" ts.jte
 sed -i.bak 's#^jms\.classes=.*#jms.classes=${ri.jars}#g' ts.jte
 sed -i.bak "s#^report.dir=.*#report.dir=$TCK_HOME/${TCK_NAME}report/${TCK_NAME}#g" ts.jte

diff --git a/docker/jstltck.sh b/docker/jstltck.sh
@@ -1,6 +1,6 @@
 #!/bin/bash -x
 
-# Copyright (c) 2018, 2022 Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2018, 2024 Oracle and/or its affiliates. All rights reserved.
 #
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License v. 2.0, which is available at
@@ -53,16 +53,23 @@ echo "TS_HOME $TS_HOME"
 
 chmod -R 777 $TS_HOME
 
-cd $TS_HOME/bin
+
+cd $WORKSPACE
 
 if [[ "$JDK" == "JDK17" || "$JDK" == "jdk17" ]];then
   export JAVA_HOME=${JDK17_HOME}
-fi
+elif [[ "$JDK" == "JDK21" || "$JDK" == "jdk21" ]];then
+  wget https://download.java.net/java/GA/jdk21.0.1/415e3f918a1f4062a0074a2794853d0d/12/GPL/openjdk-21.0.1_linux-x64_bin.tar.gz -O jdk-21.tar.gz
+  tar -xvf jdk-21.tar.gz
+  export JAVA_HOME=$WORKSPACE/jdk-21.0.1
+fi  
 export PATH=$JAVA_HOME/bin:$PATH
 
 which java
 java -version
 
+cd $TS_HOME/bin
+
 sed -i.bak "s#webServerHome=.*#webServerHome=$TCK_HOME/$GF_TOPLEVEL_DIR/glassfish#g" ts.jte
 sed -i.bak 's#webServerPort=.*#webServerPort=8080#g' ts.jte
 sed -i.bak 's#impl\.vi=.*#impl.vi=glassfish#g' ts.jte

diff --git a/docker/jtatck.sh b/docker/jtatck.sh
@@ -1,6 +1,6 @@
 #!/bin/bash -xe
 
-# Copyright (c) 2018, 2022 Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2018, 2024 Oracle and/or its affiliates. All rights reserved.
 #
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License v. 2.0, which is available at
@@ -57,16 +57,22 @@ unzip -q ${TCK_HOME}/latest-glassfish.zip -d ${TCK_HOME}
 TS_HOME=$TCK_HOME/$TCK_NAME
 echo "TS_HOME $TS_HOME"
 
-cd ${TS_HOME}/bin
+cd $WORKSPACE
 
 if [[ "$JDK" == "JDK17" || "$JDK" == "jdk17" ]];then
   export JAVA_HOME=${JDK17_HOME}
-fi
+elif [[ "$JDK" == "JDK21" || "$JDK" == "jdk21" ]];then
+  wget https://download.java.net/java/GA/jdk21.0.1/415e3f918a1f4062a0074a2794853d0d/12/GPL/openjdk-21.0.1_linux-x64_bin.tar.gz -O jdk-21.tar.gz
+  tar -xvf jdk-21.tar.gz
+  export JAVA_HOME=$WORKSPACE/jdk-21.0.1
+fi  
 export PATH=$JAVA_HOME/bin:$PATH
 
 which java
 java -version
 
+cd $TS_HOME/bin
+
 sed -i.bak "s#^webServerHome=.*#webServerHome=${TCK_HOME}/$GF_TOPLEVEL_DIR/glassfish#g" ts.jte
 sed -i.bak "s#^report.dir=.*#report.dir=${TCK_HOME}/${TCK_NAME}report/${TCK_NAME}#g" ts.jte
 sed -i.bak "s#^work.dir=.*#work.dir=${TCK_HOME}/${TCK_NAME}work/${TCK_NAME}#g" ts.jte

diff --git a/docker/saajtck.sh b/docker/saajtck.sh
@@ -1,6 +1,6 @@
 #!/bin/bash -x
 
-# Copyright (c) 2018, 2022 Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2018, 2024 Oracle and/or its affiliates. All rights reserved.
 #
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License v. 2.0, which is available at
@@ -54,16 +54,22 @@ echo "TS_HOME $TS_HOME"
 
 chmod -R 777 $TS_HOME
 
-cd $TS_HOME/bin
+cd $WORKSPACE
 
 if [[ "$JDK" == "JDK17" || "$JDK" == "jdk17" ]];then
   export JAVA_HOME=${JDK17_HOME}
-fi
+elif [[ "$JDK" == "JDK21" || "$JDK" == "jdk21" ]];then
+  wget https://download.java.net/java/GA/jdk21.0.1/415e3f918a1f4062a0074a2794853d0d/12/GPL/openjdk-21.0.1_linux-x64_bin.tar.gz -O jdk-21.tar.gz
+  tar -xvf jdk-21.tar.gz
+  export JAVA_HOME=$WORKSPACE/jdk-21.0.1
+fi  
 export PATH=$JAVA_HOME/bin:$PATH
 
 which java
 java -version
 
+cd $TS_HOME/bin
+
 sed -i.bak "s#webcontainer\.home=.*#webcontainer.home=$TCK_HOME/$GF_TOPLEVEL_DIR/glassfish#g" ts.jte
 sed -i.bak "s#webcontainer\.home.ri=.*#webcontainer.home.ri=$TCK_HOME/$GF_TOPLEVEL_DIR/glassfish#g" ts.jte
 sed -i.bak 's#wsgen.ant.classname=.*#wsgen.ant.classname=com.sun.tools.ws.ant.WsGen#g' ts.jte