Fix wrong testset and missing variable

Signed-off-by: Joonas Rautiola <[email protected]>
tiiuae · Jan 8, 2025 · 34f72d5 · 34f72d5
1 parent 2297d90
commit 34f72d5
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 9 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, testset='_boot_bat_', failedTargets=failedTargets)
+            target_jobs = utils.create_parallel_stages(targets, testset='_boot_bat_', failedTargets=failedTargets, failedHWTests=failedHWTests)
           }
         }
       }

diff --git a/utils.groovy b/utils.groovy
@@ -304,7 +304,7 @@ def nix_eval_hydrajobs(List<Map> targets) {
   }
 }
 
-def create_parallel_stages(List<Map> targets, String testset='_boot_bat_perf_', List failedTargets = null) {
+def create_parallel_stages(List<Map> targets, String testset='_boot_bat_perf_', List failedTargets=null, List failedHWTests=null) {
   def target_jobs = [:]
   targets.each {
     def timestampBegin = ""
@@ -422,14 +422,9 @@ def create_parallel_stages(List<Map> targets, String testset='_boot_bat_perf_',
       if (testset != null && it.hwtest_device != null) {
         stage("Test ${displayName}") {
           script {
-            flakeref=ghaf_hw_test(targetAttr, it.hwtest_device, '_boot_bat_perf_')
-            println ("Test creation and execution done")
-            if (flakeref==null) {
-              println("Test was OK")
-            }
-            else {
+            flakeref = ghaf_hw_test(targetAttr, it.hwtest_device, testset)
+            if (flakeref != null) {
               failedHWTests.add(flakeref)
-              println ("ERROR FOUND, target: ${flakeref}")
             }
           }
         }