Merge pull request #6517 from STEllAR-GROUP/fix-perftest-ci-env

Fix perftests CI environment

.jenkins/lsu-perftests/launch_perftests.sh

@@ -55,7 +55,8 @@ for executable in "${hpx_targets[@]}"; do
 
     # Run performance tests
     ${perftests_dir}/driver.py -v -l $logfile_tmp perftest run --local True \
-        --run_output $result --targets-and-opts "${run_command[@]}" --n_executions $n_executions  ||
+        --run_output $result --targets-and-opts "${run_command[@]}" \
+        --n_executions $n_executions -e $envfile ||
         {
             echo 'Running failed'
             test_errors=1

tools/perftests_ci/driver.py

@@ -93,10 +93,14 @@ def build(build_type, environment, target, source_dir, build_dir, install_dir,
               '-b',
               action='store_true',
               help='enable building of '+ var._project_name +' examples')
+    @args.arg('--environment', '-e', nargs='?', help='path to environment file')
     def test(run_mpi_tests, perftests_only, verbose_ctest, examples_build_dir,
-             build_examples):
+             build_examples, environment):
         import test
 
+        if environment:
+            env.load(environment)
+
         if perftests_only:
             test.run_perftests()
         else:
@@ -131,7 +135,12 @@ def perftest():
               type=int,
               help='number of executions of the benchmark executable, whose \
               results are then merged together')
-    def run(local, run_output, targets_and_opts, n_executions):
+    @args.arg('--environment', '-e', nargs='?', help='path to environment file')
+    def run(local, run_output, targets_and_opts, n_executions, environment):
+
+        if environment:
+            env.load(environment)
+
         # options
         targets_and_opts = ' '.join(targets_and_opts).lstrip()