Update for 102087

jenkinsci · Nov 5, 2024 · 1292c5f · 1292c5f
1 parent b61fbb8
commit 1292c5f
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 5 deletions.
diff --git a/src/main/resources/scripts/baseJenkinsfile.groovy b/src/main/resources/scripts/baseJenkinsfile.groovy
@@ -438,7 +438,11 @@ def setupManageProject() {
         _VECTORCAST_DIR/vpython "${env.WORKSPACE}"/vc_scripts/managewait.py --wait_time ${VC_waitTime} --wait_loops ${VC_waitLoops} --command_line "--project "${VC_Manage_Project}" ${VC_UseCILicense} --status"
         _VECTORCAST_DIR/vpython "${env.WORKSPACE}"/vc_scripts/managewait.py --wait_time ${VC_waitTime} --wait_loops ${VC_waitLoops} --command_line "--project "${VC_Manage_Project}" ${VC_UseCILicense} --force --release-locks"
         _VECTORCAST_DIR/vpython "${env.WORKSPACE}"/vc_scripts/managewait.py --wait_time ${VC_waitTime} --wait_loops ${VC_waitLoops} --command_line "--project "${VC_Manage_Project}" ${VC_UseCILicense} --config VCAST_CUSTOM_REPORT_FORMAT=HTML"
-    """
+        """
+
+    if (VC_useOneCheckoutDir) {
+        cmds += """_VECTORCAST_DIR/vpython "${env.WORKSPACE}"/vc_scripts/managewait.py --wait_time ${VC_waitTime} --wait_loops ${VC_waitLoops} --command_line "--project "${VC_Manage_Project}" ${VC_UseCILicense} --config VCAST_DEPENDENCY_CACHE_DIR=./vcqik" """
+    }
 
     if (VC_useImportedResults) {
         if (VC_useLocalImportedResults) {

diff --git a/src/main/resources/scripts/generate_lcov.py b/src/main/resources/scripts/generate_lcov.py
@@ -239,7 +239,10 @@ def generateCoverageResults(inFile, xml_data_dir = "xml_data", verbose = False):
     if not os.path.exists(lcov_data_dir):
         os.makedirs(lcov_data_dir)
 
-    open(os.path.join(lcov_data_dir, name + "-info"), "w").write(output)
+    fname = os.path.join(lcov_data_dir, name + "-info")
+    open(fname, "w").write(output)
+
+    return fname
 
 if __name__ == '__main__':
 
@@ -252,7 +255,7 @@ def generateCoverageResults(inFile, xml_data_dir = "xml_data", verbose = False):
     except:
         inFile = os.getenv('VCV_ENVIRONMENT_FILE')
 
-    generateCoverageResults(inFile, xml_data_dir = "xml_data", verbose = False)
+    infoFile = generateCoverageResults(inFile, xml_data_dir = "xml_data", verbose = False)
 
     ## if opened from VectorCAST GUI...
     if not os.getenv('VCAST_MANAGE_PROJECT_DIRECTORY') is None:

diff --git a/src/main/resources/scripts/vcast_exec.py b/src/main/resources/scripts/vcast_exec.py
@@ -345,8 +345,8 @@ def runExec(self):
 
     reportGroup = parser.add_argument_group('Report Selection', 'VectorCAST Manage reports that can be generated')
     reportGroup.add_argument('--aggregate', help='Generate aggregate coverage report VectorCAST Project', action="store_true", default = False)
-    reportGroup.add_argument('--metrics', help='Genenereate metrics reports for VectorCAST Project', action="store_true", default = False)
-    reportGroup.add_argument('--fullstatus', help='Genenereate full status reports for VectorCAST Project', action="store_true", default = False)
+    reportGroup.add_argument('--metrics', help='Generate metrics reports for VectorCAST Project', action="store_true", default = False)
+    reportGroup.add_argument('--fullstatus', help='Generate full status reports for VectorCAST Project', action="store_true", default = False)
 
     beGroup = parser.add_argument_group('Build/Execution Options', 'Options that effect build/execute operation')