Skip to content

Commit 429b41d

Browse files
Update to JenkinsfileCron file to address CI migration
1 parent 5116819 commit 429b41d

File tree

1 file changed

+18
-12
lines changed

1 file changed

+18
-12
lines changed

JenkinsfileCron

Lines changed: 18 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
@Library('tfc-lib') _
1+
@Library('tfc-lib@adef-ci') _
22

3-
dockerConfig = getDockerConfig(['MATLAB','Vivado'], matlabHSPro=false)
3+
dockerConfig = getDockerConfig(['MATLAB','Vivado','Internal'], matlabHSPro=false)
44
dockerConfig.add("-e MLRELEASE=R2023b")
55
dockerHost = 'docker'
66

@@ -27,7 +27,8 @@ stage("Build Toolbox") {
2727
}
2828
}
2929
if (branchName == 'hdl_2022_r2') {
30-
stash includes: '**', name: 'builtSources', useDefaultExcludes: false
30+
local_stash('builtSources')
31+
archiveArtifacts artifacts: 'hdl/*', followSymlinks: false, allowEmptyArchive: true
3132
}
3233
}
3334
}
@@ -43,34 +44,39 @@ def deployments = [:]
4344
for (int i=0; i < boardNames.size(); i++) {
4445
def board = boardNames[i];
4546
def nodeLabel = 'baremetal';
47+
def workspaceLabel = board + '_workspace'
48+
def bbfolder = 'bootbin_' + board
4649
if (board.contains("zcu102") || board.contains("vcu118"))
4750
nodeLabel = 'baremetal && high_memory';
4851
deployments[board] = { node(nodeLabel) {
52+
def cworkspace = env.WORKSPACE + '/' + workspaceLabel
53+
ws(cworkspace) {
4954
stage("Synthesis Tests") {
5055
withEnv(['BOARD='+board,'MLRELEASE=R2023b','HDLBRANCH=hdl_2022_r2','LC_ALL=C.UTF-8','LANG=C.UTF-8']) {
5156
try {
5257
stage("Synth") {
5358
echo "Node: ${env.NODE_NAME}"
54-
unstash "builtSources"
55-
sh 'apt install -y xvfb'
59+
local_unstash('builtSources', '', false)
5660
sh 'echo "BOARD:$BOARD"'
5761
sh 'make -C ./CI/scripts test_synth'
5862
junit testResults: 'test/*.xml', allowEmptyResults: true
5963
archiveArtifacts artifacts: 'test/*', followSymlinks: false, allowEmptyArchive: true
6064
}
61-
if (!board.contains("pluto") && !board.contains("vcu118")) {
62-
stage("Upload BOOT.BINs") {
63-
sh 'mkdir bootbins'
64-
sh 'mv test/*.BIN bootbins/'
65-
uploadArtifactory('HighSpeedConverterToolbox','bootbins/*.BIN*')
65+
if (!board.contains("pluto") && !board.contains("vcu118")) {
66+
stage("Upload BOOT.BINs") {
67+
sh 'rm -rf ' + bbfolder + ' || true'
68+
sh 'mkdir ' + bbfolder
69+
sh 'mv test/*.BIN '+bbfolder+'/'
70+
uploadArtifactory('HighSpeedConverterToolbox', bbfolder+'/*.BIN*')
71+
}
6672
}
67-
}
6873
}
6974
finally {
7075
cleanWs();
7176
}
7277
}
73-
}
78+
} // stage
79+
} // ws
7480
}}
7581
}
7682

0 commit comments

Comments
 (0)