[DO-736] fix main branch (!30)

Reviewed-on: https://git.avroid.tech/DevOps/jenkins-pipelines/pulls/30
Co-authored-by: aleksandr.vodyanov <aleksandr.vodyanov@avroid.tech>
Co-committed-by: aleksandr.vodyanov <aleksandr.vodyanov@avroid.tech>
This commit is contained in:
aleksandr.vodyanov
2024-07-18 11:01:35 +03:00
committed by Aleksandr Vodyanov
parent 7d18b08d0b
commit b00f43811b

View File

@@ -8,7 +8,7 @@ String svaceVersion = '3.4.240312'
String svacerVersion = '8-0-1'
String svaceCmd = "/data/opt/svace-${svaceVersion}-x64-linux/bin/svace"
String svacerCmd = "/data/opt/svacer-${svacerVersion}/bin/svacer"
String svaceBuildResult = ''
String svaceBuildResults = ''
String commitShortSha = ''
String svaceResultsDir = 'svace_analysis'
String svaceSarifResultFile = "svace_analysis.sarif2"
@@ -64,14 +64,6 @@ node('svace') {
}
stage('Svace analyze') {
String branch = params.BRANCH
String mainBranch = params.MAIN_BRANCH
if (params.BUILD_PLATFORM) {
branch += params.BRANCH
mainBranch += params.MAIN_BRANCH
}
sh """
tar -xf ${svaceBuildResults}
${svaceCmd} config --svace-dir ./${svaceResultsDir} THREAD_NUMBER ${buildThreads}
@@ -85,6 +77,14 @@ node('svace') {
passwordVariable: 'SVACER_PASS'
)]) {
stage('Upload results') {
String branch = params.BRANCH
String mainBranch = params.MAIN_BRANCH
if (params.BUILD_PLATFORM) {
branch += params.BRANCH
mainBranch += params.MAIN_BRANCH
}
nexusSvaceSarifRepoPath = "${params.GIT_PROJECT}/${params.BRANCH}/${commitShortSha}"
sh """
${svaceCmd} svres2sarif \