Changes required for running against Oracle JavaEE CTS bundle

Signed-off-by: anajosep <anand.francis.joseph.augustin@oracle.com>
jakartaee · Jan 29, 2019 · efe25f2 · efe25f2
1 parent da29c5b
commit efe25f2
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 12 deletions.
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -45,8 +45,9 @@ def generateCTSStage(job) {
               unstash 'jakartaeetck-bundles'
               sh """
                 env
-                unzip -o ${WORKSPACE}/jakartaeetck-bundles/javaeetck.zip -d ${CTS_HOME}
-                bash -x ${CTS_HOME}/javaeetck/docker/run_jakartaeetck.sh ${job} | tee ${WORKSPACE}/run_cts.log
+                unzip -o ${WORKSPACE}/jakartaeetck-bundles/jakartaeetck.zip -d ${CTS_HOME}
+                bash -x ${CTS_HOME}/javaeetck/docker/fix_classpaths.sh ${job} | tee ${WORKSPACE}/fix_classpaths.log
+                bash -x ${CTS_HOME}/javaeetck/docker/run_jakartaeetck.sh ${job} | tee ${WORKSPACE}/run_jakartaeetck.log
               """
               archiveArtifacts artifacts: "*-results.tar.gz,*-junitreports.tar.gz", allowEmptyArchive: true
               junit testResults: 'results/junitreports/*.xml', allowEmptyResults: true
@@ -64,7 +65,7 @@ def generateCTSStage(job) {
               unstash 'jakartaeetck-bundles'
               sh """
                 env
-                unzip -o ${WORKSPACE}/jakartaeetck-bundles/javaeetck.zip -d ${CTS_HOME}
+                unzip -o ${WORKSPACE}/jakartaeetck-bundles/jakartaeetck.zip -d ${CTS_HOME}
                 bash -x ${CTS_HOME}/javaeetck/docker/run_jakartaeetck.sh ${job} | tee ${WORKSPACE}/run_cts.log
               """
               archiveArtifacts artifacts: "*-results.tar.gz,*-junitreports.tar.gz", allowEmptyArchive: true
@@ -161,6 +162,9 @@ spec:
     string(name: 'TCK_BUNDLE_BASE_URL', 
            defaultValue: '', 
            description: 'Base URL required for downloading prebuilt binary TCK Bundle from a hosted location' )
+    string(name: 'TCK_BUNDLE_FILE_NAME', 
+           defaultValue: 'jakartaeetck.zip', 
+           description: 'Name of bundle file 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: 'DATABASE', choices: 'JavaDB\nOracle\nMySQL', 

diff --git a/docker/build_jakartaeetck.sh b/docker/build_jakartaeetck.sh
@@ -32,9 +32,20 @@ if [ -z "$GF_HOME" ]; then
 fi
 
 if [ ! -z "$TCK_BUNDLE_BASE_URL" ]; then
-   echo "Skipping build and using pre-build binary javaeetck bundle: $TCK_BUNDLE_BASE_URL/javaeetck.zip"
+   echo "Skipping build and using pre-build binary jakartaeetck bundle: $TCK_BUNDLE_BASE_URL/$TCK_BUNDLE_FILE_NAME"
    mkdir -p ${WORKSPACE}/jakartaeetck-bundles
-   wget  --progress=bar:force --no-cache ${TCK_BUNDLE_BASE_URL}/javaeetck.zip -O ${WORKSPACE}/jakartaeetck-bundles/javaeetck.zip
+   wget  --progress=bar:force --no-cache ${TCK_BUNDLE_BASE_URL}/$TCK_BUNDLE_FILE_NAME -O ${WORKSPACE}/jakartaeetck-bundles/jakartaeetck.zip
+   # Check if the bundle is from Oracle Java EE CTS project. If so add scripts required for execution.
+   unzip -l jakartaeetck.zip | grep -q docker/run_jakartaeetck.sh;
+   if [ "$?" == "0" ]; then
+     echo "Bundle contains required scripts to run the tests"
+   else
+     mkdir docker
+     wget https://raw.githubusercontent.com/eclipse-ee4j/jakartaee-tck/EE4J_8/docker/build_jakartaeetck.sh -O docker/build_jakartaeetck.sh
+     wget https://raw.githubusercontent.com/eclipse-ee4j/jakartaee-tck/EE4J_8/docker/run_jakartaeetck.sh -O docker/run_jakartaeetck.sh
+     wget https://raw.githubusercontent.com/eclipse-ee4j/jakartaee-tck/EE4J_8/docker/fix_classpaths.sh -O docker/fix_classpaths.sh
+     zip -u jakartaeetck.zip docker/run_jakartaeetck.sh docker/build_jakartaeetck.sh
+   fi
    if [ ! -z "$GF_VERSION_URL" ]; then
        wget --progress=bar:force --no-cache $GF_VERSION_URL -O glassfish.version
        cat glassfish.version
@@ -107,16 +118,16 @@ ant -f $BASEDIR/release/tools/build.xml -Ddeliverabledir=j2ee -Ddeliverable.vers
 
 mkdir -p ${WORKSPACE}/jakartaeetck-bundles
 cd ${WORKSPACE}/jakartaeetck-bundles
-cp ${WORKSPACE}/release/JAVAEE_BUILD/latest/javaeetck*.zip ${WORKSPACE}/jakartaeetck-bundles/javaeetck.zip
-cp ${WORKSPACE}/release/JAVAEE-SMOKE_BUILD/latest/javaee-smoke*.zip ${WORKSPACE}/jakartaeetck-bundles/javaee-smoke.zip
+cp ${WORKSPACE}/release/JAVAEE_BUILD/latest/javaeetck*.zip ${WORKSPACE}/jakartaeetck-bundles/jakartaeetck.zip
+cp ${WORKSPACE}/release/JAVAEE-SMOKE_BUILD/latest/javaee-smoke*.zip ${WORKSPACE}/jakartaeetck-bundles/jakartaee-smoke.zip
 
 
 #Generate Version file
 GIT_HASH=`git rev-parse HEAD`
 GIT_BRANCH=`git branch | awk '{print $2}'`
 BUILD_DATE=`date`
-rm -f ${WORKSPACE}/javaeetck.version
-touch ${WORKSPACE}/javaeetck.version
-echo "Git Revision: ${GIT_HASH}" >> ${WORKSPACE}/javaeetck.version
-echo "Git Branch: ${GIT_BRANCH}" >> ${WORKSPACE}/javaeetck.version
-echo "Build Date: ${BUILD_DATE}" >> ${WORKSPACE}/javaeetck.version
+rm -f ${WORKSPACE}/jakartaeetck.version
+touch ${WORKSPACE}/jakartaeetck.version
+echo "Git Revision: ${GIT_HASH}" >> ${WORKSPACE}/jakartaeetck.version
+echo "Git Branch: ${GIT_BRANCH}" >> ${WORKSPACE}/jakartaeetck.version
+echo "Build Date: ${BUILD_DATE}" >> ${WORKSPACE}/jakartaeetck.version