integrating Jenkkins changes

Author: TimSVector

cobertura.py

@@ -36,6 +36,7 @@
 import sys, os
 from collections import defaultdict
 from pprint import pprint
+import argparse
 
 fileList = []
 
@@ -751,19 +752,17 @@ def generateCoverageResults(inFile, azure = False, xml_data_dir = "xml_data", ve
         print("Cannot create Cobertura metrics. Please upgrade VectorCAST")
         sys.exit()
 
-    extended = False
-    azure = False
-    
-    inFile = sys.argv[1]
-    try:
-        if "--azure" == sys.argv[2]:
-            azure = True
-            print ("using azure mode")
-        elif "--extended" == sys.argv[2]:
-            extended = True
-    except Exception as e:
-        azure = False        
-        extended = False        
+    parser = argparse.ArgumentParser()
+    parser.add_argument('ManageProject',     help='Manager Project Name')
+    parser.add_argument('-e', '--extended',  help='Enabled extended Cobertura format', action="store_true", default=False)
+    parser.add_argument('-a', '--azure',     help='Generate results to target Azure', action="store_true", default=False)
+    parser.add_argument('--xml_data_dir',    help='Set the base directory of the xml_data directory. Default is the workspace directory', default = 'xml_data')
+    args = parser.parse_args()
+    extended = args.extended
+    azure = args.azure
+    
+    inFile = args.ManageProject
+    xml_data_dir = args.xml_data_dir
 
     generateCoverageResults(inFile, azure, xml_data_dir = "xml_data", verbose = False, extended = extended)
 

extract_build_dir.py

@@ -1,7 +1,7 @@
 #
 # The MIT License
 #
-# Copyright 2016 Vector Software, East Greenwich, Rhode Island USA
+# Copyright 2024 Vector Informatik, GmbH.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal

prevcast_parallel_build_execute.py

@@ -133,7 +133,6 @@ def parseParallelExecuteArgs(self):
         self.system_test_lock = Lock()
         self.mpName = self.manageProject.replace(".vcm","")
         self.mpName = os.path.basename(self.mpName)
-           
 
     def th_Print (self, str):
         self.lock.acquire()

vcast_exec.py

@@ -383,13 +383,11 @@ def runExec(self):
         else:
             output = ""
 
-         
         if checkVectorCASTVersion(25, False):
             useParallelManageCommand = True
         else:
             useParallelManageCommand = False
 
-        
         if self.jobs != "1" and checkVectorCASTVersion(20, True) and not useParallelManageCommand:
             # setup project for parallel execution
             self.manageWait.exec_manage_command ("--config VCAST_DEPENDENCY_CACHE_DIR=./vcqik")
@@ -418,7 +416,6 @@ def runExec(self):
                 jstr = "--jobs="+str(self.jobs)
             else:
                 jstr = ""
-                
             cmd = "--" + self.build_execute + " " + self.useCBT + self.level_option + self.env_option + " " + jstr + " " + output 
             build_log = self.manageWait.exec_manage_command (cmd)
             open(self.build_log_name,"w").write(build_log)
@@ -517,9 +514,7 @@ def runExec(self):
 
     if args.export_rgw:
         vcExec.exportRgw()
-
     if vcExec.useJunitFailCountPct:
         print("--exit_with_failed_count=" + args.exit_with_failed_count + " specified.  Fail Percent = " + str(round(vcExec.failed_pct,0)) + "% Return code: ", str(vcExec.failed_count))
         sys.exit(vcExec.failed_count)
 
-