pick the clang version in question from the envirnoment (#621)

* pick the clang version in question from the envirnoment

* add alternative locations to search

* add alternative locations to search

Author: dothebart

jenkins/helper/aggregate_coverage.py

@@ -22,6 +22,13 @@
 
 from site_config import SiteConfig
 
+LLVM_COV = Path(f"/usr/lib/llvm-{os.environ['CLANG_VERSION']}/bin/llvm-cov")
+if not LLVM_COV.exists():
+    LLVM_COV = Path("/usr/lib/llvm/bin/llvm-cov")
+LLVM_PROFDATA = Path(f"/usr/lib/llvm-{os.environ['CLANG_VERSION']}/bin/llvm-profdata")
+if not LLVM_PROFDATA.exists():
+    LLVM_PROFDATA = Path("/usr/lib/llvm/bin/llvm-profdata")
+
 SUCCESS = True
 
 # pylint disable=global-variable-not-assigned disable=global-statement
@@ -38,7 +45,7 @@ def launch(self, coverage_file, lcov_file):
        # pylint: disable=R0913 disable=R0902 disable=broad-except
         """ gcov merger """
         verbose = True
-        binary = "/usr/lib/llvm-16/bin/llvm-cov"
+        binary = str(LLVM_COV)
         self.job_parameters = [
             'export',
             '-format=lcov',
@@ -144,9 +151,9 @@ def post_process_launch(self, process):
     def launch(self):
        # pylint: disable=R0913 disable=R0902 disable=broad-except
         """ gcov merger """
-        binary = "/usr/lib/llvm-16/bin/llvm-profdata"
         verbose = False
         self.params = make_default_params(verbose, 111)
+        binary = str(LLVM_PROFDATA)
         print([binary] + self.job_parameters)
         start = datetime.now()
         ret = {"rc_exit": 3333}