Merge pull request #28 from gurunrao/jdk11-build

jdk11 build

Jenkinsfile

@@ -55,8 +55,8 @@ spec:
            description: 'URL required for downloading GlassFish Full/Web profile bundle' )
     choice(name: 'PROFILE', choices: 'FULL\nWEB', 
            description: 'Profile to be used for running CTS either web/full' )
-    choice(name: 'JDK', choices: 'JDK8\nJDK11',
-           description: 'Java SE Version to be used for running TCK either JDK8/JDK11' )
+    choice(name: 'JDK', choices: 'JDK11',
+           description: 'Java SE Version to be used for running TCK either JDK11' )
 	  string(name: 'TCK_BUNDLE_FILE_NAME', 
            defaultValue: '', 
 	         description: 'Name of bundle file to be appended to the base url' )

docker/build_cditck.sh

@@ -1,6 +1,6 @@
 #!/bin/bash -xe
 #
-# Copyright (c) 2018, 2020 Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2018, 2021 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
@@ -15,10 +15,12 @@
 # SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
 
 echo "ANT_HOME=$ANT_HOME"
-echo "export JAVA_HOME=$JAVA_HOME"
+echo "export JAVA_HOME=$JDK11_HOME"
 echo "export MAVEN_HOME=$MAVEN_HOME"
 echo "export PATH=$PATH"
 
+export JAVA_HOME=$JDK11_HOME
+
 cd $WORKSPACE
 
 mkdir -p ${WORKSPACE}/bundles

docker/run_cditck.sh

@@ -1,6 +1,6 @@
 #!/bin/bash -xe
 #
-# Copyright (c) 2018, 2020 Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2018, 2021 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
@@ -16,6 +16,8 @@
 
 VER=3.0.0
 
+export JAVA_HOME=$JDK11_HOME
+
 if ls ${WORKSPACE}/bundles/*cdi-tck*.zip 1> /dev/null 2>&1; then
   unzip -o ${WORKSPACE}/bundles/*cdi-tck*.zip -d ${WORKSPACE}
 else
@@ -107,10 +109,7 @@ mvn --global-settings "${TS_HOME}/settings.xml" org.apache.maven.plugins:maven-i
 which ant
 ant -version
 
-if [[ "$JDK" == "JDK11" || "$JDK" == "jdk11" ]];then
-  export JAVA_HOME=${JDK11_HOME}
-  export PATH=$JAVA_HOME/bin:$PATH
-fi
+export PATH=$JAVA_HOME/bin:$PATH
 
 which java
 java -version