refactor(tool-sonar): Use extends for common code

This commit is contained in:
Timo Beller 2022-01-20 11:51:15 +01:00
parent ee77588727
commit 3869f327ce

View File

@ -1,6 +1,5 @@
.sonar-template: .sonar-template-common:
stage: test stage: test
image: $MAVEN_IMAGE
variables: variables:
SONAR_HOST_URL: http://sonar7.exxcellent.de/sonar7 SONAR_HOST_URL: http://sonar7.exxcellent.de/sonar7
SONAR_PROJECT_KEY: "" SONAR_PROJECT_KEY: ""
@ -9,6 +8,10 @@
SONAR_SKIP_BUILD_BREAKER: "true" SONAR_SKIP_BUILD_BREAKER: "true"
SONAR_BUILDBREAKER_QUERYMAXATTEMPTS: "30" SONAR_BUILDBREAKER_QUERYMAXATTEMPTS: "30"
SONAR_BUILDBREAKER_QUERYINTERVAL: "10000" SONAR_BUILDBREAKER_QUERYINTERVAL: "10000"
.sonar-template:
extends: .sonar-template-common
image: $MAVEN_IMAGE
script: script:
- mvn $MAVEN_CLI_OPTS test sonar:sonar - mvn $MAVEN_CLI_OPTS test sonar:sonar
"-Dsonar.host.url=$SONAR_HOST_URL" "-Dsonar.host.url=$SONAR_HOST_URL"
@ -21,16 +24,8 @@
"-Dsonar.buildbreaker.queryInterval=${SONAR_BUILDBREAKER_QUERYINTERVAL}" "-Dsonar.buildbreaker.queryInterval=${SONAR_BUILDBREAKER_QUERYINTERVAL}"
.sonar-template-gradle: .sonar-template-gradle:
stage: test extends: .sonar-template-common
image: $GRADLE_IMAGE image: $GRADLE_IMAGE
variables:
SONAR_HOST_URL: http://sonar7.exxcellent.de/sonar7
SONAR_PROJECT_KEY: ""
SONAR_PROJECT_NAME: ""
SONAR_EXCLUSIONS: "**/target/**,**/src/test/**"
SONAR_SKIP_BUILD_BREAKER: "false"
SONAR_BUILDBREAKER_QUERYMAXATTEMPTS: "30"
SONAR_BUILDBREAKER_QUERYINTERVAL: "10000"
script: script:
- ./gradlew $GRADLE_OPTS sonarqube - ./gradlew $GRADLE_OPTS sonarqube
"-Dsonar.host.url=$SONAR_HOST_URL" "-Dsonar.host.url=$SONAR_HOST_URL"
@ -41,4 +36,3 @@
"-Dsonar.buildbreaker.skip=$SONAR_SKIP_BUILDBREAKER" "-Dsonar.buildbreaker.skip=$SONAR_SKIP_BUILDBREAKER"
"-Dsonar.buildbreaker.queryMaxAttempts=${SONAR_BUILDBREAKER_QUERYMAXATTEMPTS}" "-Dsonar.buildbreaker.queryMaxAttempts=${SONAR_BUILDBREAKER_QUERYMAXATTEMPTS}"
"-Dsonar.buildbreaker.queryInterval=${SONAR_BUILDBREAKER_QUERYINTERVAL}" "-Dsonar.buildbreaker.queryInterval=${SONAR_BUILDBREAKER_QUERYINTERVAL}"