Updates to hide missing tar command

Update to fix directory of system test results

Author: TimSVector

src/main/resources/scripts/baseJenkinsfile.groovy

@@ -1,3 +1,51 @@
+ // ===========================================================
+// 
+// Auto-generated script by VectorCAST Execution Plug-in 
+// based on the information provided when creating the 
+//
+//     VectorCAST > Pipeline job
+//
+// ===========================================================
+
+VC_Manage_Project  = 'CurrentRelease/vcast-workarea/vc_manage/PointOfSales_Manage.vcm'
+VC_EnvSetup        = '''call %WORKSPACE%/setenv.bat
+'''
+VC_Build_Preamble  = ""
+VC_EnvTeardown     = ''''''
+def scmStep () { git 'https://github.com/TimSVector/PointOfSales_v2.git' }
+VC_usingSCM = true
+VC_postScmStepsCmds = ''''''
+VC_sharedArtifactDirectory = ''''''
+VC_Agent_Label = 'Host_Test_Node'
+VC_waitTime = '30'
+VC_waitLoops = '1'
+VC_maxParallel = 0
+VC_useOneCheckoutDir = false
+VC_UseCILicense = ""
+VC_useCBT = "--incremental"
+VC_useCoveragePlugin = true
+VC_createdWithVersion = '0.78-SNAPSHOT (private-22152ed7-vaprti)'
+VC_usePCLintPlus = false
+VC_pclpCommand = ''
+VC_pclpResultsPattern = '**/*lint_results.txt'
+VC_useSquore = false
+VC_squoreCommand = ''''''
+VC_useTESTinsights = false
+VC_TESTinsights_URL = ''
+VC_TESTinsights_Project = "${JOB_BASE_NAME}"
+VC_TESTinsights_Proxy = ''
+VC_TESTinsights_Credential_ID = ''
+VC_TESTinsightsScmUrl = ''
+VC_TESTinsights_SCM_Tech = 'git'
+VC_TESTinsights_Revision = ""
+VC_useCoverageHistory = false
+VC_useStrictImport = true
+VC_useRGW3 = false
+VC_useImportedResults = false
+VC_useLocalImportedResults = false
+VC_useExternalImportedResults = false
+VC_externalResultsFilename = ""
+
 // Code Coverage threshold numbers
 // Basis path coverage is no longer support after VectorCAST 2019SP1
 VC_Healthy_Target = [ maxStatement: 100, maxBranch: 100, maxFunctionCall: 100, maxFunction: 100, maxMCDC: 100,
@@ -757,9 +805,11 @@ pipeline {
                         }
                     }
 
-                    // archive existing reports                    
-                    catchError(buildResult: 'SUCCESS', stageResult: 'SUCCESS') {
+                    // archive existing reports   
+                    try {
                        tar file: "reports_archive.tar" , glob: "management/*.html,xml_data/**/*.xml", overwrite: true
+                    } catch {
+                        println "tar unavailable"
                     }
 
                     println "Created with VectorCAST Execution Version: " + VC_createdWithVersion

src/main/resources/scripts/generate_qa_results_xml.py

@@ -37,7 +37,7 @@ def writeJunitFooter(junitfile):
 
 def write_tc_data(currentEnv, unit_report_name, jobNameDotted, passed, failed, error, testcase_data, encoding = 'utf-8', xml_data_dir = "xml_data"):
 
-    fh = open(os.path.join(xml_data_dir,"junit",unit_report_name), "w")
+    fh = open(os.path.join(xml_data_dir,unit_report_name), "w")
 
     writeJunitHeader(currentEnv, fh, failed, failed+passed, unit_report_name, encoding)
     writeJunitData(fh, testcase_data)

src/main/resources/scripts/generate_xml.py

@@ -96,8 +96,6 @@ def __init__(self, FullManageProjectName, verbose, teePrint, use_cte):
         self.testsuite = ""
         self.env = ""
         self.build_dir = ""
-        
-        self.fh_data = ""
 
         if self.teePrint is None:
             self.teePrint = tee_print.TeePrint()
@@ -1057,8 +1055,6 @@ def __init__(self, FullManageProjectName, build_dir, env, compiler, testsuite, c
         self.api.commit = dummy
         self.failed_count = 0
         self.passed_count = 0
-        
-
 
 #
 # GenerateXml - add any compound tests to the unit report
@@ -1232,7 +1228,6 @@ def start_unit_test_file(self):
                 else:
                     success += 1
                     self.passed_count += 1
-
         self.fh_data = ""
         self.fh_data += ("<?xml version=\"1.0\" encoding=\"" + self.encFmt.upper() + "\"?>\n")
         self.fh_data += ("<testsuites>\n")
@@ -1380,11 +1375,10 @@ def write_testcase(self, tc, unit_name, func_name, st_is_monitored = False, unit
         testsuite = escape(self.testsuite, quote=False).replace(".","")
         envName = escape(self.env, quote=False).replace(".","")
 
-        tc_name_full =  unit_name + "." + func_name + "." + tc_name
-
         classname = compiler + "." + testsuite + "." + envName
 
         if isSystemTest:
+            tc_name_full =  classname + "." + tc_name
             exp_total = tc.total
             exp_pass = tc.passed
             result = "  System Test Build Status: " + tc.build_status + ". \n   System Test: " + tc.name + " \n   Execution Status: "
@@ -1401,6 +1395,7 @@ def write_testcase(self, tc, unit_name, func_name, st_is_monitored = False, unit
                 tc.passed = 0
 
         else:
+            tc_name_full =  unit_name + "." + func_name + "." + tc_name
             summary = tc.history.summary
             exp_total = summary.expected_total
             exp_pass = exp_total - summary.expected_fail
@@ -1447,7 +1442,7 @@ def write_testcase(self, tc, unit_name, func_name, st_is_monitored = False, unit
 
         testcaseString, testcaseStringExtraStatus = self.get_xml_string(fpath)
 
-        if self.use_cte:
+        if self.use_cte or unitName == "":
             unitName = classname
 
         if status != "":