2 files changed, 10 insertions, 0 deletions
diff --git a/.ci/templates/job-uhd-devtest-rhombus.yml b/.ci/templates/job-uhd-devtest-rhombus.yml
index c7db12f9c..1395b0de0 100644
--- a/.ci/templates/job-uhd-devtest-rhombus.yml
+++ b/.ci/templates/job-uhd-devtest-rhombus.yml
@@ -25,6 +25,7 @@ jobs:
     dutMatrix:
       ${{ if contains(parameters.testDevices, 'x3xx') }}:
         rhombus-x300-UBX-0:
+          devAgent: x3xxb2xx
           devType: 'x300'
           devModel: 'x300'
           devName: 'rhombus-x300-UBX-0'
@@ -36,6 +37,7 @@ jobs:
           jtagSerial: '2516350A6019'
           jtagServer: 'nitest@sdr-rhombus'
         rhombus-x310-UBX-0:
+          devAgent: x3xxb2xx
           devType: 'x300'
           devModel: 'x310'
           devName: 'rhombus-x310-UBX-0'
@@ -47,6 +49,7 @@ jobs:
           jtagSerial: '251635138E98'
           jtagServer: 'nitest@sdr-rhombus'
         rhombus-x310-CBX-0:
+          devAgent: x3xxb2xx
           devType: 'x300'
           devModel: 'x310'
           devName: 'rhombus-x310-CBX-0'
@@ -58,6 +61,7 @@ jobs:
           jtagSerial: '2516350796C2'
           jtagServer: 'nitest@sdr-rhombus'
         rhombus-x310-WBX-0:
+          devAgent: x3xxb2xx
           devType: 'x300'
           devModel: 'x310'
           devName: 'rhombus-x310-WBX-0'
@@ -69,6 +73,7 @@ jobs:
           jtagSerial: '2516350C5BFF'
           jtagServer: 'nitest@sdr-rhombus'
         rhombus-x310-TWINRX-0:
+          devAgent: x3xxb2xx
           devType: 'x300'
           devModel: 'x310'
           devName: rhombus-x310-TWINRX-0
@@ -80,6 +85,7 @@ jobs:
           jtagSerial: '251635F43D13'
           jtagServer: 'nitest@sdr-rhombus'
         rhombus-x300-SBX-0:
+          devAgent: x3xxb2xx
           devType: 'x300'
           devModel: 'x300'
           devName: rhombus-x300-SBX-0
@@ -93,6 +99,7 @@ jobs:
 
       ${{ if contains(parameters.testDevices, 'b2xx') }}:
         rhombus-b210-0:
+          devAgent: x3xxb2xx
           devType: 'b200'
           devModel: 'b210'
           devName: rhombus-b210-0
@@ -102,6 +109,7 @@ jobs:
 
       ${{ if contains(parameters.testDevices, 'n3xx') }}:
         rhombus-n310-0:
+          devAgent: rhombus-n310-0
           devType: 'n3xx'
           devModel: 'n310'
           devName: rhombus-n310-0
@@ -115,6 +123,7 @@ jobs:
           devSDImage: gnuradio-image-ni-sulfur-rev11-mender.sdimg.bz2
           devLabgridConfig: .ci/templates/tests/rhombus-labgrid/device-configs/rhombus-n310-0.yml
         rhombus-n321-0:
+          devAgent: rhombus-n321-0
           devType: 'n3xx'
           devModel: 'n320'
           devName: rhombus-n321-0
diff --git a/.ci/templates/job-uhd-devtest.yml b/.ci/templates/job-uhd-devtest.yml
index a277167c0..2b284c7ab 100644
--- a/.ci/templates/job-uhd-devtest.yml
+++ b/.ci/templates/job-uhd-devtest.yml
@@ -29,6 +29,7 @@ jobs:
     demands:
     - suiteName -equals ${{ parameters.suiteName }}
     - testOS -equals ${{ parameters.testOS }}
+    - device -equals $(devAgent)
   variables:
   - group: sdr-pipeline-vars
   strategy: