ci: devtest: add x310-4 to s175-devtests

.ci/templates/job-uhd-devtest-s175.yml

@@ -11,7 +11,7 @@ parameters:
   type: string
 - name: testDevices
   type: string
-  default: 'b2xx'
+  default: 'b2xx,x3xx'
 
 jobs:
 - template: job-uhd-devtest.yml
@@ -23,8 +23,8 @@ jobs:
     uhdArtifactSource: '${{ parameters.uhdArtifactSource }}'
     uhdFpgaArtifactSource: '${{ parameters.uhdFpgaArtifactSource }}'
     fpga_imgs_source: '${{ parameters.fpga_imgs_source }}'
-    redisHost: ''
-    vivado_dir: '/opt/Xilinx/Vivado_Lab/2020.1/'
+    redisHost: 'dre-s175'
+    vivado_dir: $(xilinx_location)
     dutMatrix:
       ${{ if contains(parameters.testDevices, 'b2xx') }}:
         sdr-s175-dev-tests-b206-0:
@@ -33,4 +33,16 @@ jobs:
           devName: sdr_s175_tests-b206-0
           devSerial: $(b206_devSerial)
           devBus: 'usb'
-          devtestPattern: 'b2xx'
+          devtestPattern: 'b2xx'
+      ${{ if contains(parameters.testDevices, 'x3xx') }}:
+        sdr-s175-dev-tests-x310-4:
+          devType: 'x300'
+          devModel: 'x310'
+          devName: sdr_s175_x310_4
+          devSerial: $(x310_4_devSerial)
+          devBus: 'ip'
+          devAddr: $(x310_4_devAddr)
+          devFpga: 'HG,XG'
+          devtestPattern: 'x3x0'
+          jtagSerial: $(x310_4_jtagSerial)
+          jtagServer: 'nitest@dre-s175'

.ci/templates/stages-uhd-pipeline.yml

@@ -632,7 +632,7 @@ stages:
     parameters:
       uhdSrcDir: $(Build.SourcesDirectory)
       fpga_imgs_source: ${{ parameters.fpga_imgs_source }}
-      testDevices: 'b2xx'
+      testDevices: 'x3xx,b2xx'
 
 - stage: devtest_uhd_n3xx_e320_stage
   displayName: Dev Test UHD n3xx e320

.ci/utils/mutex_hardware.py

@@ -266,6 +266,7 @@ def flash_sdimage_tftp(
 def get_redis_server(args):
     """Return the Redis object from the given URL (args.redis_server) or None if no URL was provided."""
     if args.redis_server:
+        print("Using redis server at {}".format(args.redis_server), flush=True)
         return {Redis.from_url("redis://{}:6379/0".format(args.redis_server))}
     else:
         return None
@@ -274,6 +275,7 @@ def get_redis_server(args):
 def main_mutexed(args):
     """Main entry point for mutex_hardware."""
     print("Waiting to acquire mutex for {}".format(args.dut_name), flush=True)
+    print("ARGS: {}".format(args), flush=True)
     with Redlock(
         key=args.dut_name,
         masters=get_redis_server(args),