Changed path for storing log file, and redirecting stderr to log file

Signed-off-by: anajosep <anand.francis.joseph.augustin@oracle.com>
jakartaee · Feb 1, 2019 · 2ad9911 · 2ad9911
1 parent 4e7c4bb
commit 2ad9911
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 15 deletions.
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -35,9 +35,9 @@ def generateCTSStage(job) {
             container('james-mail') {
              sh """
                cd /root 
-               /root/startup.sh | tee $WORKSPACE/mailserver.log &
+               /root/startup.sh | tee /root/mailserver.log &
                sleep 120
-               bash -x /root/create_users.sh
+               bash -x /root/create_users.sh 2>&1 | tee /root/create_users.log
                echo "Mail server setup complete"
              """
             }
@@ -46,8 +46,8 @@ def generateCTSStage(job) {
               sh """
                 env
                 unzip -o ${WORKSPACE}/jakartaeetck-bundles/jakartaeetck.zip -d ${CTS_HOME}
-                bash -x ${CTS_HOME}/javaeetck/docker/fix_classpaths.sh | tee ${WORKSPACE}/fix_classpaths.log
-                bash -x ${CTS_HOME}/javaeetck/docker/run_jakartaeetck.sh ${job} | tee ${WORKSPACE}/run_jakartaeetck.log
+                bash -x ${CTS_HOME}/javaeetck/docker/fix_classpaths.sh 2>&1 | tee ${CTS_HOME}/fix_classpaths.log
+                bash -x ${CTS_HOME}/javaeetck/docker/run_jakartaeetck.sh ${job} 2>&1 | tee ${CTS_HOME}/run_jakartaeetck.log
               """
               archiveArtifacts artifacts: "*-results.tar.gz,*-junitreports.tar.gz", allowEmptyArchive: true
               junit testResults: 'results/junitreports/*.xml', allowEmptyResults: true
@@ -66,8 +66,8 @@ def generateCTSStage(job) {
               sh """
                 env
                 unzip -o ${WORKSPACE}/jakartaeetck-bundles/jakartaeetck.zip -d ${CTS_HOME}
-                bash -x ${CTS_HOME}/javaeetck/docker/fix_classpaths.sh | tee ${WORKSPACE}/fix_classpaths.log
-                bash -x ${CTS_HOME}/javaeetck/docker/run_jakartaeetck.sh ${job} | tee ${WORKSPACE}/run_cts.log
+                bash -x ${CTS_HOME}/javaeetck/docker/fix_classpaths.sh 2>&1 | tee ${CTS_HOME}/fix_classpaths.log
+                bash -x ${CTS_HOME}/javaeetck/docker/run_jakartaeetck.sh ${job} 2>&1 | tee ${CTS_HOME}/run_cts.log
               """
               archiveArtifacts artifacts: "*-results.tar.gz,*-junitreports.tar.gz", allowEmptyArchive: true
               junit testResults: 'results/junitreports/*.xml', allowEmptyResults: true
@@ -93,7 +93,7 @@ def generateStandaloneTCKStage(job) {
             unstash 'standalone-bundles'
             sh """
               env
-              bash -x ${WORKSPACE}/docker/${job}tck.sh | tee ${WORKSPACE}/${job}tck.log
+              bash -x ${WORKSPACE}/docker/${job}tck.sh 2>&1 | tee ${WORKSPACE}/${job}tck.log
             """
             archiveArtifacts artifacts: "${job}tck-results.tar.gz,*-junitreports.tar.gz,${job}tck.log",allowEmptyArchive: true
             junit testResults: 'results/junitreports/*.xml', allowEmptyResults: true
@@ -199,9 +199,9 @@ spec:
         container('jakartaeetck-ci') {
           sh """
             env
-            bash -x ${WORKSPACE}/docker/build_jakartaeetck.sh | tee ${WORKSPACE}/build_jakartaeetck.log
+            bash -x ${WORKSPACE}/docker/build_jakartaeetck.sh 2>&1 | tee ${WORKSPACE}/build_jakartaeetck.log
           """
-          archiveArtifacts artifacts: "jakartaeetck-bundles/*.zip,*.version", allowEmptyArchive: true
+          archiveArtifacts artifacts: "jakartaeetck-bundles/*.zip,*.version,*.log", allowEmptyArchive: true
           stash includes: 'jakartaeetck-bundles/*.zip', name: 'jakartaeetck-bundles'
         }
       }
@@ -248,7 +248,7 @@ spec:
         container('jakartaeetck-ci') {
           sh """
             env
-            bash -x ${WORKSPACE}/docker/build_standalone-tcks.sh ${standalone_tcks} | tee ${WORKSPACE}/build_standalone-tcks.log
+            bash -x ${WORKSPACE}/docker/build_standalone-tcks.sh ${standalone_tcks} 2>&1 | tee ${WORKSPACE}/build_standalone-tcks.log
           """
           archiveArtifacts artifacts: "standalone-bundles/*.zip,*.version,*.log", allowEmptyArchive: true
           stash includes: 'standalone-bundles/*.zip', name: 'standalone-bundles'

diff --git a/docker/build_standalone-tcks.sh b/docker/build_standalone-tcks.sh
@@ -14,9 +14,6 @@
 #
 # SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
 
-# Hudson log file location for archiving later.
-LOGFILE=/log
-
 export BASEDIR=${WORKSPACE}
 if [ -z "${GF_HOME}" ]; then
   export GF_HOME=${WORKSPACE}
@@ -34,7 +31,6 @@ if [ "false" == "${buildStandaloneTCKFlag}" ]; then
 fi
 
 echo "########## Trunk.Install.V5 Config ##########"
-# Install GF 5.0 - not latest //TODO update with latest gf link
 wget --progress=bar:force --no-cache $GF_BUNDLE_URL -O latest-glassfish.zip
 unzip -o latest-glassfish.zip
 

diff --git a/docker/run_jakartaeetck.sh b/docker/run_jakartaeetck.sh
@@ -395,7 +395,7 @@ else
   sed -i "s/name=\"${TEST_SUITE}\"/name=\"${TEST_SUITE}_${vehicle_name}\"/g" ${WORKSPACE}/results/junitreports/${TEST_SUITE}-junit-report.xml
   mv ${WORKSPACE}/results/junitreports/${TEST_SUITE}-junit-report.xml  ${WORKSPACE}/results/junitreports/${TEST_SUITE}_${vehicle_name}-junit-report.xml
 fi
-tar zcvf ${WORKSPACE}/${RESULT_FILE_NAME} ${WORKSPACE}/*.log ${JT_REPORT_DIR} ${JT_WORK_DIR} ${WORKSPACE}/results/junitreports/ ${CTS_HOME}/javaeetck/bin/ts.* ${CTS_HOME}/vi/glassfish5/glassfish/domains/domain1/
+tar zcvf ${WORKSPACE}/${RESULT_FILE_NAME} ${CTS_HOME}/*.log ${JT_REPORT_DIR} ${JT_WORK_DIR} ${WORKSPACE}/results/junitreports/ ${CTS_HOME}/javaeetck/bin/ts.* ${CTS_HOME}/vi/glassfish5/glassfish/domains/domain1/
 
 if [ -z ${vehicle} ];then
   JUNIT_REPORT_FILE_NAME=${TEST_SUITE}-junitreports.tar.gz