Specify testset for the parallel stages

Signed-off-by: Joonas Rautiola <[email protected]>
tiiuae · Dec 3, 2024 · eeb703c · eeb703c
1 parent 37882da
commit eeb703c
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 11 deletions.
diff --git a/ghaf-main-pipeline.groovy b/ghaf-main-pipeline.groovy
@@ -114,7 +114,7 @@ pipeline {
         dir(WORKDIR) {
           script {
             utils.nix_eval_jobs(targets)
-            target_jobs = utils.create_parallel_stages(targets,false,failedTargets)
+            target_jobs = utils.create_parallel_stages(targets, testset='_boot_bat_', failedTargets=failedTargets)
           }
         }
       }

diff --git a/ghaf-nightly-pipeline.groovy b/ghaf-nightly-pipeline.groovy
@@ -186,7 +186,7 @@ pipeline {
             utils.nix_eval_hydrajobs(hydrajobs_targets)
             targets = targets + hydrajobs_targets
 
-            target_jobs = utils.create_parallel_stages(targets, skip_hw_test=true)
+            target_jobs = utils.create_parallel_stages(targets, testset=null)
           }
         }
       }

diff --git a/ghaf-pre-merge-pipeline.groovy b/ghaf-pre-merge-pipeline.groovy
@@ -192,7 +192,7 @@ pipeline {
         dir(WORKDIR) {
           script {
             utils.nix_eval_jobs(targets)
-            target_jobs = utils.create_parallel_stages(targets)
+            target_jobs = utils.create_parallel_stages(targets, testset=null)
           }
         }
       }

diff --git a/ghaf-release-pipeline.groovy b/ghaf-release-pipeline.groovy
@@ -124,7 +124,7 @@ pipeline {
         dir(WORKDIR) {
           script {
             utils.nix_eval_jobs(targets)
-            target_jobs = utils.create_parallel_stages(targets, skip_hw_test=true)
+            target_jobs = utils.create_parallel_stages(targets, testset=null)
           }
         }
       }

diff --git a/utils.groovy b/utils.groovy
@@ -301,9 +301,7 @@ def nix_eval_hydrajobs(List<Map> targets) {
   }
 }
 
-
-// , List failedTargets = []
-def create_parallel_stages(List<Map> targets, Boolean skip_hw_test=false, List failedTargets = null) {
+def create_parallel_stages(List<Map> targets, String testset='_boot_bat_perf_', List failedTargets = null) {
   def target_jobs = [:]
   targets.each {
     def timestampBegin = ""
@@ -419,10 +417,10 @@ def create_parallel_stages(List<Map> targets, Boolean skip_hw_test=false, List f
         }
       }
 
-      if (!skip_hw_test && it.hwtest_device != null) {
+      if (testset != null && it.hwtest_device != null) {
         stage("Test ${displayName}") {
           script {
-            ghaf_hw_test(targetAttr, it.hwtest_device, '_boot_bat_perf_')
+            ghaf_hw_test(targetAttr, it.hwtest_device, testset)
           }
         }
       }
@@ -433,5 +431,3 @@ def create_parallel_stages(List<Map> targets, Boolean skip_hw_test=false, List f
 }
 
 return this
-
-////////////////////////////////////////////////////////////////////////////////