From ea0dded3ecfa98420934c3329e4f4a73da22f9d5 Mon Sep 17 00:00:00 2001
From: Steven Koo <steven.koo@ni.com>
Date: Fri, 3 Jun 2022 13:17:09 -0500
Subject: ci: Run multiple fpgas per job

This consolidates the different FPGA runs into a single job.

Signed-off-by: Steven Koo <steven.koo@ni.com>
---
 .ci/templates/job-uhd-devtest-rhombus.yml | 90 +++++--------------------------
 1 file changed, 12 insertions(+), 78 deletions(-)

(limited to '.ci/templates/job-uhd-devtest-rhombus.yml')

diff --git a/.ci/templates/job-uhd-devtest-rhombus.yml b/.ci/templates/job-uhd-devtest-rhombus.yml
index a05f47644..8e4c3ba9e 100644
--- a/.ci/templates/job-uhd-devtest-rhombus.yml
+++ b/.ci/templates/job-uhd-devtest-rhombus.yml
@@ -20,135 +20,69 @@ jobs:
     uhdArtifactSource: '${{ parameters.uhdArtifactSource }}'
     redisHost: 'sdr-rhombus'
     dutMatrix:
-      rhombus-x300-UBX-0 XG:
+      rhombus-x300-UBX-0:
         devType: 'x300'
         devModel: 'x300'
         devName: 'rhombus-x300-UBX-0'
         devSerial: '30A6019'
         devBus: 'ip'
         devAddr: '192.168.40.2'
-        devFpga: 'XG'
+        devFpga: 'HG,XG'
         devtestPattern: 'x3x0'
         jtagSerial: '2516350A6019'
         jtagServer: 'nitest@sdr-rhombus'
-      rhombus-x310-UBX-0 XG:
+      rhombus-x310-UBX-0:
         devType: 'x300'
         devModel: 'x310'
         devName: 'rhombus-x310-UBX-0'
         devSerial: '3138EF5'
         devBus: 'ip'
         devAddr: '192.168.40.3'
-        devFpga: 'XG'
+        devFpga: 'HG,XG'
         devtestPattern: 'x3x0'
         jtagSerial: '251635138E98'
         jtagServer: 'nitest@sdr-rhombus'
-      rhombus-x310-CBX-0 XG:
+      rhombus-x310-CBX-0:
         devType: 'x300'
         devModel: 'x310'
         devName: 'rhombus-x310-CBX-0'
         devSerial: '30796C2'
         devBus: 'ip'
         devAddr: '192.168.40.4'
-        devFpga: 'XG'
+        devFpga: 'HG,XG'
         devtestPattern: 'x3x0'
         jtagSerial: '2516350796C2'
         jtagServer: 'nitest@sdr-rhombus'
-      rhombus-x310-WBX-0 XG:
+      rhombus-x310-WBX-0:
         devType: 'x300'
         devModel: 'x310'
         devName: 'rhombus-x310-WBX-0'
         devSerial: '30C5BFF'
         devBus: 'ip'
         devAddr: '192.168.40.5'
-        devFpga: 'XG'
+        devFpga: 'HG,XG'
         devtestPattern: 'x3x0'
         jtagSerial: '2516350C5BFF'
         jtagServer: 'nitest@sdr-rhombus'
-      rhombus-x310-TWINRX-0 XG:
+      rhombus-x310-TWINRX-0:
         devType: 'x300'
         devModel: 'x310'
         devName: rhombus-x310-TWINRX-0
         devSerial: 'F43D13'
         devBus: 'ip'
         devAddr: '192.168.40.6'
-        devFpga: 'XG'
+        devFpga: 'HG,XG'
         devtestPattern: 'x3x0'
         jtagSerial: '251635F43D13'
         jtagServer: 'nitest@sdr-rhombus'
-      rhombus-x300-SBX-0 XG:
+      rhombus-x300-SBX-0:
         devType: 'x300'
         devModel: 'x300'
         devName: rhombus-x300-SBX-0
         devSerial: '32244AD'
         devBus: 'ip'
         devAddr: '192.168.40.7'
-        devFpga: 'XG'
-        devtestPattern: 'x3x0'
-        jtagSerial: '2516352244AD'
-        jtagServer: 'nitest@sdr-rhombus'
-      rhombus-x300-UBX-0 HG:
-        devType: 'x300'
-        devModel: 'x300'
-        devName: 'rhombus-x300-UBX-0'
-        devSerial: '30A6019'
-        devBus: 'ip'
-        devAddr: '192.168.40.2'
-        devFpga: 'HG'
-        devtestPattern: 'x3x0'
-        jtagSerial: '2516350A6019'
-        jtagServer: 'nitest@sdr-rhombus'
-      rhombus-x310-UBX-0 HG:
-        devType: 'x300'
-        devModel: 'x310'
-        devName: 'rhombus-x310-UBX-0'
-        devSerial: '3138EF5'
-        devBus: 'ip'
-        devAddr: '192.168.40.3'
-        devFpga: 'HG'
-        devtestPattern: 'x3x0'
-        jtagSerial: '251635138E98'
-        jtagServer: 'nitest@sdr-rhombus'
-      rhombus-x310-CBX-0 HG:
-        devType: 'x300'
-        devModel: 'x310'
-        devName: 'rhombus-x310-CBX-0'
-        devSerial: '30796C2'
-        devBus: 'ip'
-        devAddr: '192.168.40.4'
-        devFpga: 'HG'
-        devtestPattern: 'x3x0'
-        jtagSerial: '2516350796C2'
-        jtagServer: 'nitest@sdr-rhombus'
-      rhombus-x310-WBX-0 HG:
-        devType: 'x300'
-        devModel: 'x310'
-        devName: 'rhombus-x310-WBX-0'
-        devSerial: '30C5BFF'
-        devBus: 'ip'
-        devAddr: '192.168.40.5'
-        devFpga: 'HG'
-        devtestPattern: 'x3x0'
-        jtagSerial: '2516350C5BFF'
-        jtagServer: 'nitest@sdr-rhombus'
-      rhombus-x310-TWINRX-0 HG:
-        devType: 'x300'
-        devModel: 'x310'
-        devName: rhombus-x310-TWINRX-0
-        devSerial: 'F43D13'
-        devBus: 'ip'
-        devAddr: '192.168.40.6'
-        devFpga: 'HG'
-        devtestPattern: 'x3x0'
-        jtagSerial: '251635F43D13'
-        jtagServer: 'nitest@sdr-rhombus'
-      rhombus-x300-SBX-0 HG:
-        devType: 'x300'
-        devModel: 'x300'
-        devName: rhombus-x300-SBX-0
-        devSerial: '32244AD'
-        devBus: 'ip'
-        devAddr: '192.168.40.7'
-        devFpga: 'HG'
+        devFpga: 'HG,XG'
         devtestPattern: 'x3x0'
         jtagSerial: '2516352244AD'
         jtagServer: 'nitest@sdr-rhombus'
-- 
cgit v1.2.3