Skip to content

Commit

Permalink
Syntax fix 2
Browse files Browse the repository at this point in the history
  • Loading branch information
asolimando committed Jul 26, 2024
1 parent 9a064cf commit 43f0996
Showing 1 changed file with 9 additions and 10 deletions.
19 changes: 9 additions & 10 deletions Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -42,22 +42,21 @@ node('ubuntu') {
stage('Code Quality') {
timeout(time: 1, unit: 'HOURS') {
withEnv(["Path+JDK=$JAVA_JDK_17/bin","JAVA_HOME=$JAVA_JDK_17"]) {
def JVM_ARGS = "-XX:+UseG1GC -Xmx1536m -XX:MaxMetaspaceSize=512m"
// SONAR_TOKEN is a secret and can't be interpolated in a Groovy string for security measures,
// see https://www.jenkins.io/doc/book/pipeline/jenkinsfile/#interpolation-of-sensitive-environment-variables
def COMMON_ARGS = """
build --no-parallel --no-daemon jacocoAggregateTestReport \
sonar -PenableJacoco -Porg.sonarqube.version=4.4.1.3373 \
-Dorg.gradle.jvmargs='${JVM_ARGS}' \
""".trim()
withCredentials([string(credentialsId: 'SONARCLOUD_TOKEN', variable: 'SONAR_TOKEN')]) {
def JVM_ARGS = "-XX:+UseG1GC -Xmx1536m -XX:MaxMetaspaceSize=512m"
// SONAR_TOKEN is a secret and can't be interpolated in a Groovy string for security measures,
// see https://www.jenkins.io/doc/book/pipeline/jenkinsfile/#interpolation-of-sensitive-environment-variables
def COMMON_ARGS = """
build --no-parallel --no-daemon jacocoAggregateTestReport \
sonar -PenableJacoco -Porg.sonarqube.version=4.4.1.3373 \
-Dorg.gradle.jvmargs='${JVM_ARGS}' \
"""

if (env.BRANCH_NAME.startsWith("PR-")) {
def PR_ARGS = """
-Dsonar.pullrequest.branch=${CHANGE_BRANCH} \
-Dsonar.pullrequest.base=${CHANGE_TARGET} \
-Dsonar.pullrequest.key=${CHANGE_ID} \
"""
""".trim()
sh "./gradlew ${COMMON_ARGS} ${PR_ARGS} -Dsonar.token=${SONAR_TOKEN}"
} else {
sh "./gradlew ${COMMON_ARGS} -Dsonar.branch.name=${BRANCH_NAME} -Dsonar.token=${SONAR_TOKEN}"
Expand Down

0 comments on commit 43f0996

Please sign in to comment.