Tfcollins/synth (#192)

* Change bootbin folder and cleanup for synth builds Signed-off-by: Travis F. Collins <[email protected]> * Fix display exports Signed-off-by: Travis F. Collins <[email protected]> * Fix display exports Signed-off-by: Travis F. Collins <[email protected]> * Fix synth parallel tests to be more isolated Signed-off-by: Travis F. Collins <[email protected]> --------- Signed-off-by: Travis F. Collins <[email protected]>
analogdevicesinc · Dec 20, 2024 · eb3fd49 · eb3fd49
1 parent 35450ed
commit eb3fd49
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 12 deletions.
diff --git a/CI/scripts/synth_designs.sh b/CI/scripts/synth_designs.sh
@@ -1,4 +1,5 @@
 #!/bin/bash
+set -x
 
 BOARD=$1
 MLFLAGS="-nodisplay -nodesktop -nosplash"
@@ -16,9 +17,9 @@ sed -i "s/hdlcoder_board_customization/hdlcoder_board_customization_local/g" tes
 source /opt/Xilinx/Vivado/2022.2/settings64.sh
 # Randomize DISPLAY number to avoid conflicts
 export DISPLAY_ID=:$(shuf -i 10-1000 -n 1)
-Xvfb :$DISPLAY_ID &
+Xvfb $DISPLAY_ID &
 XVFB_PID=$!
-export DISPLAY=:$DISPLAY_ID
+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');"

diff --git a/CI/scripts/targeting_designs.sh b/CI/scripts/targeting_designs.sh
@@ -1,4 +1,5 @@
 #!/bin/bash
+set -x
 
 MLFLAGS="-nodisplay -nodesktop -nosplash"
 
@@ -18,9 +19,9 @@ cd ../..
 source /opt/Xilinx/Vivado/2022.2/settings64.sh
 # Randomize DISPLAY number to avoid conflicts
 export DISPLAY_ID=:$(shuf -i 10-1000 -n 1)
-Xvfb :$DISPLAY_ID &
+Xvfb $DISPLAY_ID &
 XVFB_PID=$!
-export DISPLAY=:$DISPLAY_ID
+export DISPLAY=$DISPLAY_ID
 export SWT_GTK3=0
 source /opt/Xilinx/Vivado/2022.2/settings64.sh
 $MLPATH/$MLRELEASE/bin/matlab $MLFLAGS -r "addpath(genpath('test'));addpath(genpath('deps'));runDemoTests('$DEMO');"

diff --git a/JenkinsfileCron b/JenkinsfileCron
@@ -52,9 +52,13 @@ def deployments = [:]
 for (int i=0; i < boardNames.size(); i++) {
     def board = boardNames[i];
     def nodeLabel = 'baremetal';
+    def workspaceLabel = board + '_workspace'
+    def bbfolder = 'bootbin_' + board
     if (board.contains("zcu102"))
         nodeLabel = 'baremetal && high_memory';
     deployments[board] = { node(nodeLabel) {
+        def cworkspace = env.WORKSPACE + '/' + workspaceLabel
+        ws(cworkspace) {
         stage("Synthesis Tests") {
             withEnv(['BOARD='+board,'MLRELEASE=R2023b','HDLBRANCH=hdl_2022_r2','LC_ALL=C.UTF-8','LANG=C.UTF-8']) {
                 try {
@@ -66,19 +70,21 @@ for (int i=0; i < boardNames.size(); i++) {
                         junit testResults: 'test/*.xml', allowEmptyResults: true
                         archiveArtifacts artifacts: 'test/*', followSymlinks: false, allowEmptyArchive: true
                     }
-		    if (!board.contains("pluto")) {
-			    stage("Upload BOOT.BINs") {
-				sh 'mkdir bootbins'
-				sh 'mv test/*.BIN bootbins/'
-				uploadArtifactory('TransceiverToolbox','bootbins/*.BIN*')
-			    }
-		    }
+                    if (!board.contains("pluto")) {
+                        stage("Upload BOOT.BINs") {
+                            sh 'rm -rf ' + bbfolder + ' || true'
+                            sh 'mkdir ' + bbfolder
+                            sh 'mv test/*.BIN '+bbfolder+'/'
+                            uploadArtifactory('TransceiverToolbox', bbfolder+'/*.BIN*')
+                        }
+                    }
                 }
                 finally {
                     cleanWs();
                 }
             }
-        }
+        } // stage
+        } // ws
     }}
 }