From f67eb2090b3c5466c74b4ab8c42c5381c6bb16d2 Mon Sep 17 00:00:00 2001 From: Aleksandr Vodyanov Date: Wed, 29 Jan 2025 16:20:03 +0300 Subject: [PATCH] [DO-1528] update svacer and svace (!69) Co-authored-by: aleksandr.vodyanov Reviewed-on: https://git.avroid.tech/DevOps/jenkins-pipelines/pulls/69 Reviewed-by: Andrey Danin --- pipelines/DevSecOps/svace-analyze.groovy | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/pipelines/DevSecOps/svace-analyze.groovy b/pipelines/DevSecOps/svace-analyze.groovy index d4b4a4c..4e22d78 100644 --- a/pipelines/DevSecOps/svace-analyze.groovy +++ b/pipelines/DevSecOps/svace-analyze.groovy @@ -4,9 +4,6 @@ import tech.avroid.api.Nexus import tech.avroid.scm.Git String buildThreads = '28' -String svacerVersion = '9-0-2' -String svaceCmd = "/data/opt/svace-${env.JENKINS_SVACE_VERSION}-x64-linux/bin/svace" -String svacerCmd = "/data/opt/svacer-${svacerVersion}/bin/svacer" String svaceBuildResults = '' String commitShortSha = '' String ldapServer = 'FreeIPA' @@ -81,8 +78,8 @@ node('svace') { stage('Svace analyze') { sh """ tar -xf ${svaceBuildResults} - ${svaceCmd} config --svace-dir ./${env.JENKINS_SVACE_BUILD_DIR} THREAD_NUMBER ${buildThreads} - ${svaceCmd} analyze --log-level brief --svace-dir ./${env.JENKINS_SVACE_BUILD_DIR} + svace config --svace-dir ./${env.JENKINS_SVACE_BUILD_DIR} THREAD_NUMBER ${buildThreads} + svace analyze --log-level brief --svace-dir ./${env.JENKINS_SVACE_BUILD_DIR} """ } @@ -100,20 +97,20 @@ node('svace') { } sh """ - ${svaceCmd} svres2sarif \ + svace svres2sarif \ ${env.JENKINS_SVACE_BUILD_DIR}/.svace-dir/analyze-res/svace_analysis.svres \ -o ${env.JENKINS_SVACE_SARIF_FILE} cd ${env.JENKINS_SVACE_BUILD_DIR} - ${svacerCmd} import --svace ${svaceCmd} \ + svacer import --svace svace \ --project ${params.GIT_PROJECT} \ --branch ${branch} \ --snapshot "${commitShortSha} - `date -R`" \ --source-tree ${env.WORKSPACE}/${params.GIT_PROJECT} \ --if-no-branch clone-${mainBranch} - ${svacerCmd} upload --ssl \ + svacer upload --ssl \ --user ${VAULT_SVACER_LOGIN} \ --password ${VAULT_SVACER_PASS} \ --ldap_server ${ldapServer}