Updates from Jenkins update

Author: TimSVector

getjobs.py

@@ -159,8 +159,17 @@ def printEnvInfoNoDataAPI(ManageProjectName, printData = True, printEnvType = Fa
     out, err = p.communicate()
     buildDirInfo = out.splitlines()
 
-    max_indent = min(max(len(line) - len(line.lstrip()) for line in enabledList), 8)
+    # max_indent = min(max(len(line) - len(line.lstrip()) for line in enabledList), 8)
 
+    max_indent = 0
+    veryMax = 8
+
+    for line in enabledList:
+        indent = len(line) - len(line.lstrip())
+        
+        if indent > max_indent and indent <= veryMax:
+            max_indent = indent
+
     if max_indent == 8:
         source_match_string    = "^   [^\s]"
         machine_match_string   = "^    [^\s]"
@@ -180,6 +189,8 @@ def printEnvInfoNoDataAPI(ManageProjectName, printData = True, printEnvType = Fa
         testsuite_match_string = "^    [^\s]"
         group_match_string     = None
         env_match_string       = "^     [^\s]"
+    else:
+        raise ValueError("error deciphering max_index" +  str(max_indent))
 
     source = None
     machine = None

safe_open.py

@@ -47,13 +47,16 @@ def new_get_file_encoding():
 def open(file, mode='r', buffering=-1, encoding=None, errors=None, newline=None, closefd=True, opener=None):
 
     if 'b' in mode:
-        fd = _open(file, mode, buffering, encoding, errors, newline, closefd, opener)
+        try:
+            fd = _open(file, mode, buffering, encoding, errors, newline, closefd, opener)
+        except:
+            fd = _open(file, mode, buffering, encoding, errors, newline, closefd)
     else:
         if os.path.exists(file):
             encoding = new_get_file_encoding()
         else:
             encoding = "utf-8"
-        fd = _open(file, mode, buffering, encoding, errors, newline, closefd, opener)
+        fd = _open(file, mode, buffering, encoding, errors, newline)
 
     try:
         yield fd

test_import.py

@@ -1,9 +1,14 @@
-import os
+import os, sys
 
 os.environ['JENKINS_URL'] = 'http://localhost:8080/'
 os.environ['USERNAME'] = 'tms'
 os.environ['PASSWORD'] = 'schneider'
 
+if sys.version_info[0] < 3:
+    python_path_updates = os.path.join(os.environ['VECTORCAST_DIR'], "DATA", "python")
+    sys.path.append(python_path_updates)
+
+
 
 try:
     import archive_extract_reports
@@ -34,6 +39,11 @@
             vc_script = os.path.join(os.environ['WORKSPACE'], "vc_scripts", "generate-results.py")
             import imp
             generate_results = imp.load_source("generate_results", vc_script)
+    try:
+        import parallel_build_execute
+    except:
+        import prevcast_parallel_build_execute as parallel_build_execute
+            
     import generate_lcov
     import generate_pclp_reports
     import generate_qa_results_xml
@@ -45,7 +55,6 @@
     import managewait
     import merge_vcr
     import patch_rgw_directory
-    import prevcast_parallel_build_execute
     import safe_open
     import tee_print
     import vcast_exec

vcast_exec.py

@@ -22,13 +22,10 @@
 # THE SOFTWARE.
 #
 
-import os, subprocess,argparse, glob, sys, shutil
-from vector.apps.DataAPI.vcproject_api import VCProjectApi 
+import os, subprocess,argparse, glob, sys, shutil 
 
 from managewait import ManageWait
 
-import cobertura
-import generate_lcov
 import patch_rgw_directory as rgw
 
 try:
@@ -41,14 +38,17 @@
         vc_script = os.path.join(os.environ['WORKSPACE'], "vc_scripts", "generate-results.py")
         import imp
         generate_results = imp.load_source("generate_results", vc_script)
-    
+
+if sys.version_info[0] < 3:
+    python_path_updates = os.path.join(os.environ['VECTORCAST_DIR'], "DATA", "python")
+    sys.path.append(python_path_updates)
+
 try:
-    import vector.apps.parallel.parallel_build_execute as parallel_build_execute
+    import parallel_build_execute
 except:
     import prevcast_parallel_build_execute as parallel_build_execute
 
 from vcast_utils import checkVectorCASTVersion, dump
-import generate_sonarqube_testresults 
 
 from enum import Enum
 
@@ -287,12 +287,15 @@ def runLcovMetrics(self):
             print("XXX Cannot create LCOV metrics. Please upgrade VectorCAST\n")
         else:
             print("Creating LCOV Metrics")
+            import generate_lcov
             generate_lcov.generateCoverageResults(self.FullMP, self.xml_data_dir, verbose = self.verbose, source_root = self.source_root)
 
     def runCoberturaMetrics(self):
         if not checkVectorCASTVersion(21):
             print("Cannot create Cobertura metrics. Please upgrade VectorCAST")
         else:
+            import cobertura
+
             if self.cobertura_extended:
                 print("Creating Extended Cobertura Metrics")
             else:
@@ -306,22 +309,22 @@ def runSonarQubeMetrics(self):
             print("Cannot create SonarQube metrics. Please upgrade VectorCAST")
         else:
             print("Creating SonarQube Metrics")
+            import generate_sonarqube_testresults 
             generate_sonarqube_testresults.run(self.FullMP, self.xml_data_dir)
 
     def runPcLintPlusMetrics(self):
         print("Creating PC-lint Plus Metrics")
-        import generate_pclp_reports 
-        os.makedirs(os.path.join(self.xml_data_dir,"pclp"))
-        report_name = os.path.join(self.xml_data_dir,"pclp","gl-code-quality-report.json")
-        print("PC-lint Plus Metrics file: " + report_name)
-        generate_pclp_reports.generate_reports(self.pclp_input, output_gitlab = report_name)
-        
-        if args.pclp_output_html:
-            if not checkVectorCASTVersion(21):
-                print("Cannot create PC-Lint Plus HTML report. Please upgrade VectorCAST")
-            else:
+        if not checkVectorCASTVersion(21):
+            print("Cannot create PC-Lint Plus HTML report. Please upgrade VectorCAST")
+        else:
+            import generate_pclp_reports 
+            os.makedirs(os.path.join(self.xml_data_dir,"pclp"))
+            report_name = os.path.join(self.xml_data_dir,"pclp","gl-code-quality-report.json")
+            print("PC-lint Plus Metrics file: " + report_name)
+            generate_pclp_reports.generate_reports(self.pclp_input, output_gitlab = report_name)
+            
+            if args.pclp_output_html:
                 print("Creating PC-lint Plus Findings")
-                import generate_pclp_reports 
                 generate_pclp_reports.generate_html_report(self.FullMP, self.pclp_input, self.pclp_output_html)
 
     def runReports(self):
@@ -341,17 +344,23 @@ def generateTestCaseMgtRpt(self):
         else:
             for file in glob.glob("management/*_management_report.html"):
                 os.remove(file)
-            
-        with VCProjectApi(self.FullMP) as vcprojApi:
-            for env in vcprojApi.Environment.all():
-                if not env.is_active:
-                    continue
-                        
-                self.needIndexHtml = True
 
-                report_name = env.compiler.name + "_" + env.testsuite.name + "_" + env.name + "_management_report.html"
-                report_name = os.path.join("management",report_name)
-                env.api.report(report_type="MANAGEMENT_REPORT", formats=["HTML"], output_file=report_name)
+        if checkVectorCASTVersion(21):
+            from vector.apps.DataAPI.vcproject_api import VCProjectApi
+                                   
+            with VCProjectApi(self.FullMP) as vcprojApi:
+                for env in vcprojApi.Environment.all():
+                    if not env.is_active:
+                        continue
+                            
+                    self.needIndexHtml = True
+                    
+                    report_name = env.compiler.name + "_" + env.testsuite.name + "_" + env.name + "_management_report.html"
+                    report_name = os.path.join("management",report_name)
+                    env.api.report(report_type="MANAGEMENT_REPORT", formats=["HTML"], output_file=report_name)
+        else:
+            print("Cannot create Test Case Management HTML report. Please upgrade VectorCAST")
+
 
     def exportRgw(self):
         rgw.updateReqRepo(VC_Manage_Project=self.FullMP, VC_Workspace=os.getcwd() , top_level=False)