Merge pull request #190 from analogdevicesinc/tfcollins/synth-ci

Tfcollins/synth ci

CI/scripts/synth_designs.sh

@@ -14,14 +14,14 @@ cd ../..
 cp hdl/vendor/AnalogDevices/hdlcoder_board_customization.m test/hdlcoder_board_customization_local.m
 sed -i "s/hdlcoder_board_customization/hdlcoder_board_customization_local/g" test/hdlcoder_board_customization_local.m
 source /opt/Xilinx/Vivado/2022.2/settings64.sh
-Xvfb :77 &
-export DISPLAY=:77
+# Randomize DISPLAY number to avoid conflicts
+export DISPLAY_ID=:$(shuf -i 10-1000 -n 1)
+Xvfb :$DISPLAY_ID &
+XVFB_PID=$!
+export DISPLAY=:$DISPLAY_ID
 export SWT_GTK3=0
 source /opt/Xilinx/Vivado/2022.2/settings64.sh
 $MLPATH/$MLRELEASE/bin/matlab $MLFLAGS -r "cd('test');runSynthTests('$BOARD');"
 EC=$?
-pidof Xvfb
-if [ $? -eq 0 ]; then
-    kill -9 `pidof Xvfb`
-fi
+kill -9 $XVFB_PID || true
 exit $EC

JenkinsfileCron

@@ -1,6 +1,6 @@
-@Library('tfc-lib') _
+@Library('tfc-lib@adef-ci') _
 
-dockerConfig = getDockerConfig(['MATLAB','Vivado'], matlabHSPro=false)
+dockerConfig = getDockerConfig(['MATLAB','Vivado','Internal'], matlabHSPro=false)
 dockerConfig.add("-e MLRELEASE=R2023b")
 dockerHost = 'docker'
 
@@ -30,7 +30,7 @@ stage("Build Toolbox") {
 		}
         }
         if (branchName == 'hdl_2022_r2') {
-            stash includes: '**', name: 'builtSources', useDefaultExcludes: false
+            local_stash('builtSources')
             archiveArtifacts artifacts: 'hdl/*', followSymlinks: false, allowEmptyArchive: true
         }
     }
@@ -60,8 +60,7 @@ for (int i=0; i < boardNames.size(); i++) {
                 try {
                     stage("Synth") {
                         echo "Node: ${env.NODE_NAME}"
-                        unstash "builtSources"
-                        sh 'apt install -y xvfb'
+                        local_unstash('builtSources', '', false)
                         sh 'echo "BOARD:$BOARD"'
                         sh 'make -C ./CI/scripts test_synth'
                         junit testResults: 'test/*.xml', allowEmptyResults: true
@@ -85,10 +84,10 @@ for (int i=0; i < boardNames.size(); i++) {
 
 parallel deployments
 
-node {
-    stage("Trigger Harness") {
-        echo "Node: ${env.NODE_NAME}"
-        unstash "builtSources"
-        triggerHWHarness("TransceiverToolbox")
-    }
-}
+// node {
+//     stage("Trigger Harness") {
+//         echo "Node: ${env.NODE_NAME}"
+//         local_unstash('builtSources')
+//         triggerHWHarness("TransceiverToolbox")
+//     }
+// }