Use all precision boards with smoke tests

Signed-off-by: Julia Pineda <[email protected]>
analogdevicesinc · Jun 13, 2024 · 3a846c3 · 3a846c3
1 parent c87bcaf
commit 3a846c3
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 15 deletions.
diff --git a/JenkinsfileHW b/JenkinsfileHW
@@ -12,12 +12,13 @@ lock(label: 'adgt_test_harness_boards') {
     harness.set_env('libiio_repo', 'http://gateway.englab:3000/mirrors/libiio.git')
     harness.set_env('libiio_branch', 'v0.25')
     harness.set_env('nebula_repo', 'http://gateway.englab:3000/mirrors/nebula.git')
-    harness.set_env('nebula_branch','dev')
+    harness.set_env('nebula_branch','main')
     harness.set_env('nebula_config_branch','release')
     // harness.set_env('telemetry_repo', 'http://gateway.englab:3000/mirrors/telemetry.git')
     // harness.set_env('telemetry_branch', 'master')
     harness.set_env('matlab_repo', 'https://github.com/analogdevicesinc/PrecisionToolbox.git') // Not necessary when using checkout scm
     harness.set_env('matlab_release','R2021b')
+    harness.set_env('matlab_license','network')
     harness.set_matlab_timeout('30m')
 
     //Update nebula config from netbox
@@ -26,11 +27,13 @@ lock(label: 'adgt_test_harness_boards') {
     harness.set_env('netbox_ip','primary.englab')
     harness.set_env('netbox_port','8000')
     harness.set_env('netbox_base_url','netbox')
-    harness.set_env('netbox_token','0123456789abcdef0123456789abcdef01234567')
-    harness.set_env('netbox_devices_tag','active')
+    withCredentials([string(credentialsId: 'netbox_token', variable: 'TOKEN')]) {
+        harness.set_env('netbox_token', TOKEN)
+    }
+    harness.set_env('netbox_devices_tag','precision')
 
     //Update agent with required deps
-    harness.set_required_agent(["sdg-nuc-01"])
+    harness.set_required_agent(["sdg-nuc-04"])
     harness.set_env('update_container_lib', true)
     harness.set_env('update_lib_requirements', true)
     harness.update_agents()
@@ -42,15 +45,11 @@ lock(label: 'adgt_test_harness_boards') {
     harness.set_send_telemetry(false)
     harness.set_log_jira(false)
     harness.set_enable_resource_queuing(true)
-    harness.set_lock_agent(true) // Required for MATLAB toolbox tests
+    harness.set_lock_agent(false)
     harness.set_elastic_server('192.168.10.1')
-    //harness.set_required_hardware(["zynq-zed-ad7380",                                  
-    //                              "zynq-zed-ad7768",
-    //                              "zynq-zed-ad7768-1",
-    //                              "zynq-zed-ad4030",
-    //                              "zynq-zed-ad4630-16",
-    //                             "zynq-zed-ad4630-24"])
-    harness.set_required_hardware(["zynq-zed-adv7511-ad7768-1-evb"])
+    harness.set_required_hardware(["zynq-zed-adv7511-ad7768-1-evb-precision",
+                                    "zynq-zed-adv7511-ad4630-24-precision",
+                                    "zynq-zed-adv7511-ad7768-axi-adc-precision"])
     harness.set_docker_args(['Vivado', 'MATLAB'])
     harness.set_nebula_local_fs_source_root("artifactory.analog.com")
 

diff --git a/test/runHWTests.m b/test/runHWTests.m
@@ -12,18 +12,24 @@ function runHWTests(board)
 import matlab.unittest.selectors.HasName;
 import matlab.unittest.selectors.HasProcedureName;
 
+baseVariant = false;
 switch board
     case "zynq-zed-ad7380"
         at = 'AD7380';
-    case "zynq-zed-ad7768"
+    case {"zynq-zed-ad7768", ...
+            "zynq-zed-adv7511-ad7768-axi-adc-precision"}
         at = 'AD7768';
-    case "zynq-zed-adv7511-ad7768-1-evb"
+        baseVariant = true;
+    case {"zynq-zed-adv7511-ad7768-1-evb", ...
+            "zynq-zed-adv7511-ad7768-1-evb-precision"}
         at = 'AD7768_1';
     case "zynq-zed-ad4030"
         at = 'AD4030';
     case "zynq-zed-ad4630-16"
         at = 'AD4630_16';
-    case "zynq-zed-ad4630-24"
+        baseVariant = true;
+    case {"zynq-zed-ad4630-24", ...
+            "zynq-zed-adv7511-ad4630-24-precision"}
         at = 'AD4630_24';
 
     otherwise
@@ -37,6 +43,9 @@ function runHWTests(board)
 else
     suite = testsuite(ats);
     suite = selectIf(suite,HasProcedureName(ContainsSubstring(at,'IgnoringCase',true)));
+    if baseVariant
+        suite = selectIf(suite,HasProcedureName(~ContainsSubstring("_")));
+    end
 end
 
 try