Nuc HW-test to main and nightly pipeline

Signed-off-by: Henri Rosten <[email protected]>
tiiuae · Aug 23, 2024 · 9b3976f · 9b3976f
1 parent a1b7f17
commit 9b3976f
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 17 deletions.
diff --git a/ghaf-main-pipeline.groovy b/ghaf-main-pipeline.groovy
@@ -52,8 +52,7 @@ pipeline {
             utils.nix_build('.#packages.x86_64-linux.nvidia-jetson-orin-nx-debug-from-x86_64', 'archive')
             utils.nix_build('.#packages.x86_64-linux.lenovo-x1-carbon-gen11-debug', 'archive')
             utils.nix_build('.#packages.x86_64-linux.microchip-icicle-kit-debug-from-x86_64', 'archive')
-            // Build, but don't archive the build results:
-            utils.nix_build('.#packages.x86_64-linux.generic-x86_64-debug')
+            utils.nix_build('.#packages.x86_64-linux.generic-x86_64-debug', 'archive')
             utils.nix_build('.#packages.x86_64-linux.doc')
           }
         }
@@ -80,6 +79,7 @@ pipeline {
             utils.ghaf_hw_test('.#packages.x86_64-linux.nvidia-jetson-orin-nx-debug-from-x86_64', 'orin-nx', jenkins_url)
             utils.ghaf_hw_test('.#packages.aarch64-linux.nvidia-jetson-orin-nx-debug', 'orin-nx', jenkins_url)
             utils.ghaf_hw_test('.#packages.x86_64-linux.lenovo-x1-carbon-gen11-debug', 'lenovo-x1', jenkins_url)
+            utils.ghaf_hw_test('.#packages.x86_64-linux.generic-x86_64-debug', 'nuc', jenkins_url)
           }
         }
       }

diff --git a/ghaf-nightly-pipeline.groovy b/ghaf-nightly-pipeline.groovy
@@ -82,21 +82,6 @@ pipeline {
         }
       }
     }
-    stage('HW test') {
-      steps {
-        dir(WORKDIR) {
-          script {
-            jenkins_url = "https://ghaf-jenkins-controller-dev.northeurope.cloudapp.azure.com"
-            testset = "_boot_bat_perf_"
-            utils.ghaf_hw_test('.#packages.x86_64-linux.nvidia-jetson-orin-agx-debug-from-x86_64', 'orin-agx', jenkins_url, testset)
-            utils.ghaf_hw_test('.#packages.aarch64-linux.nvidia-jetson-orin-agx-debug', 'orin-agx', jenkins_url, testset)
-            utils.ghaf_hw_test('.#packages.x86_64-linux.nvidia-jetson-orin-nx-debug-from-x86_64', 'orin-nx', jenkins_url, testset)
-            utils.ghaf_hw_test('.#packages.aarch64-linux.nvidia-jetson-orin-nx-debug', 'orin-nx', jenkins_url, testset)
-            utils.ghaf_hw_test('.#packages.x86_64-linux.lenovo-x1-carbon-gen11-debug', 'lenovo-x1', jenkins_url, testset)
-          }
-        }
-      }
-    }
     stage('Provenance') {
       steps {
         dir(WORKDIR) {
@@ -148,6 +133,22 @@ pipeline {
         }
       }
     }
+    stage('HW test') {
+      steps {
+        dir(WORKDIR) {
+          script {
+            jenkins_url = "https://ghaf-jenkins-controller-dev.northeurope.cloudapp.azure.com"
+            testset = "_boot_bat_perf_"
+            utils.ghaf_hw_test('.#packages.x86_64-linux.nvidia-jetson-orin-agx-debug-from-x86_64', 'orin-agx', jenkins_url, testset)
+            utils.ghaf_hw_test('.#packages.aarch64-linux.nvidia-jetson-orin-agx-debug', 'orin-agx', jenkins_url, testset)
+            utils.ghaf_hw_test('.#packages.x86_64-linux.nvidia-jetson-orin-nx-debug-from-x86_64', 'orin-nx', jenkins_url, testset)
+            utils.ghaf_hw_test('.#packages.aarch64-linux.nvidia-jetson-orin-nx-debug', 'orin-nx', jenkins_url, testset)
+            utils.ghaf_hw_test('.#packages.x86_64-linux.lenovo-x1-carbon-gen11-debug', 'lenovo-x1', jenkins_url, testset)
+            utils.ghaf_hw_test('.#packages.x86_64-linux.generic-x86_64-debug', 'nuc', jenkins_url, testset)
+          }
+        }
+      }
+    }
   }
 }