Added option to download GF version info file and removed overwriting…

… report dir on rerun

Signed-off-by: anajosep <anand.francis.joseph.augustin@oracle.com>

Jenkinsfile

@@ -126,6 +126,9 @@ spec:
     string(name: 'GF_BUNDLE_URL', 
            defaultValue: '', 
            description: 'URL required for downloading GlassFish Full/Web profile bundle' )
+    string(name: 'GF_VERSION_URL', 
+           defaultValue: '', 
+           description: 'URL required for downloading GlassFish version details' )
     string(name: 'TCK_BUNDLE_BASE_URL', 
            defaultValue: '', 
            description: 'Base URL required for downloading prebuilt binary TCK Bundle from a hosted location' )
@@ -158,7 +161,7 @@ spec:
             env
             bash -x ${WORKSPACE}/docker/build_jakartaeetck.sh
           """
-          archiveArtifacts artifacts: 'jakartaeetck-bundles/*.zip'
+          archiveArtifacts artifacts: "jakartaeetck-bundles/*.zip,glassfish.version", allowEmptyArchive: true
           stash includes: 'jakartaeetck-bundles/*.zip', name: 'jakartaeetck-bundles'
         }
       }
@@ -201,7 +204,7 @@ spec:
             env
             bash -x ${WORKSPACE}/docker/build_standalone-tcks.sh ${standalone_tcks}
           """
-          archiveArtifacts artifacts: 'standalone-bundles/*.zip'
+          archiveArtifacts artifacts: "standalone-bundles/*.zip,glassfish.version", allowEmptyArchive: true
           stash includes: 'standalone-bundles/*.zip', name: 'standalone-bundles'
         }
       }

docker/build_jakartaeetck.sh

@@ -68,6 +68,11 @@ wget --progress=bar:force --no-cache $GF_BUNDLE_URL -O latest-glassfish.zip
 unzip -o latest-glassfish.zip
 ls -l $GF_HOME/glassfish5/glassfish/
 
+if [ ! -z "$GF_VERSION_URL" ]; then
+  wget --progress=bar:force --no-cache $GF_VERSION_URL -O glassfish.version
+  cat glassfish.version
+fi
+
 echo "########## Trunk.Clean.Build.Libs ##########"
 ant -f $BASEDIR/install/j2ee/bin/build.xml -Ddeliverabledir=j2ee -Dbasedir=$BASEDIR/install/j2ee/bin clean.all build.all.jars
 

docker/build_standalone-tcks.sh

@@ -38,6 +38,11 @@ echo "########## Trunk.Install.V5 Config ##########"
 wget --progress=bar:force --no-cache $GF_BUNDLE_URL -O latest-glassfish.zip
 unzip -o latest-glassfish.zip
 
+if [ ! -z "$GF_VERSION_URL" ]; then
+  wget --progress=bar:force --no-cache $GF_VERSION_URL -O glassfish.version
+  cat glassfish.version
+fi
+
 export ANT_OPTS="-Xmx2G -Djava.endorsed.dirs=${BASEDIR}/glassfish5/glassfish/modules/endorsed \
 -Djavax.xml.accessExternalStylesheet=all \
 -Djavax.xml.accessExternalSchema=all \

docker/run_jakartaeetck.sh

@@ -214,7 +214,6 @@ export JT_WORK_DIR=${CTS_HOME}/jakartaeetck-work
 cd ${TS_HOME}/bin
 sed -i "s#^report.dir=.*#report.dir=${JT_REPORT_DIR}#g" ts.jte
 sed -i "s#^work.dir=.*#work.dir=${JT_WORK_DIR}#g" ts.jte
-sed -i "s#^if.existing.work.report.dirs=.*#if.existing.work.report.dirs=overwrite#g" ts.jte
 
 sed -i "s/^mailHost=.*/mailHost=${MAIL_HOST}/g" ts.jte
 sed -i "s/^mailuser1=.*/mailuser1=${MAIL_USER}/g" ts.jte