Merge branch 'main' into add_test_slack_back

tiiuae · Dec 10, 2024 · 9283a76 · 9283a76
2 parents e35cb99 + 0246bcb
commit 9283a76
Show file tree

Hide file tree

Showing 5 changed files with 10 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,failedHWTests)
+            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)
           }
         }
       }
@@ -208,7 +208,7 @@ pipeline {
               stage("Test ${it.target} (${it.system})") {
                 script {
                   def targetAttr = "${it.system}.${it.target}"
-                  utils.ghaf_hw_test(targetAttr, it.hwtest_device, '_boot_bat_perf_')
+                  utils.ghaf_hw_test(targetAttr, it.hwtest_device, '_boot_gui_bat_perf_video_logging_')
                 }
               }
             }

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
@@ -295,15 +295,16 @@ def nix_eval_hydrajobs(List<Map> targets) {
   """
 
   targets.each {
-    target = "${it.system}.${it.target}"
+    // note that this is in flipped order compared to #packages
+    target = "${it.target}.${it.system}"
     drvPath = sh(script: "jq -r '.\"${target}\".drvPath' < results.json", returnStdout: true).trim()
     evalError = sh(script: "jq -r '.\"${target}\".error' < results.json", returnStdout: true).trim()
     it.drvPath = drvPath
     it.error = evalError == "null" ? null : evalError
   }
 }
 
-def create_parallel_stages(List<Map> targets, Boolean skip_hw_test=false, List failedTargets = null, List failedHWTests =null) {
+def create_parallel_stages(List<Map> targets, String testset='_boot_bat_perf_', List failedTargets = null) {
   def target_jobs = [:]
   targets.each {
     def timestampBegin = ""
@@ -380,7 +381,7 @@ def create_parallel_stages(List<Map> targets, Boolean skip_hw_test=false, List f
                 mkdir -p ${scsdir}
                 provenance ${it.drvPath} --recursive --out ${outpath}
               """
-              sign_file(outpath, "sig/${outpath}.sig", "INT-Ghaf-Devenv-Provenance")
+              sign_file(outpath, "${outpath}.sig", "INT-Ghaf-Devenv-Provenance")
             }
           }
         }
@@ -418,7 +419,7 @@ 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 {
             errorstatus=ghaf_hw_test(targetAttr, it.hwtest_device, '_boot_bat_perf_')
@@ -440,5 +441,3 @@ def create_parallel_stages(List<Map> targets, Boolean skip_hw_test=false, List f
 }
 
 return this
-
-////////////////////////////////////////////////////////////////////////////////