updates

Author: TimSVector

incremental_build_report_aggregator.py

@@ -30,6 +30,11 @@
 import os, shutil, glob, logging
 import sys, os
 
+from vcast_utils import checkVectorCASTVersion
+
+if not checkVectorCASTVersion(21):
+    raise ImportError("Cannot combine incremental rebuild reports with this version of VectorCAST. Please upgrade.")
+    
 from bs4 import BeautifulSoup
 
 try:

prevcast_parallel_build_execute.py

@@ -28,7 +28,11 @@
 from datetime import timedelta
 from io import open
 
-import incremental_build_report_aggregator
+aggregate_incremental_build_reports = True
+try:
+    import incremental_build_report_aggregator
+except ImportError:
+    aggregate_incremental_build_reports = False
 
 from vcast_utils import getVectorCASTEncoding
 
@@ -326,7 +330,10 @@ def cleanup(self):
             fd.write(build_log_data.encode(self.encFmt, "replace"))
 
         if self.incremental:
-            incremental_build_report_aggregator.parse_html_files(self.mpName)
+            if aggregate_incremental_build_reports:
+                incremental_build_report_aggregator.parse_html_files(self.mpName)
+            else:
+                print("Cannot combine incremental rebuild reports with this version of VectorCAST. Please upgrade")
 
     def doit(self):
         ## create the directory structure in the manage project before building

test_import.py

@@ -1,6 +1,6 @@
 import os, sys
 import traceback
-
+from vcast_utils import checkVectorCASTVersion
 try:
     ModuleNotFoundError
 except NameError:
@@ -58,7 +58,9 @@
     import generate_sonarqube_testresults
     import generate_xml
     import getjobs
-    import incremental_build_report_aggregator
+    if checkVectorCASTVersion(21):
+        import incremental_build_report_aggregator
+    
     import managewait
     import merge_vcr
     import patch_rgw_directory