From 09af2fe47caa447988626ab78fb6a5196c71e433 Mon Sep 17 00:00:00 2001 From: Richard Salac Date: Fri, 27 Sep 2024 09:58:31 +0200 Subject: [PATCH 1/2] verbose logging Signed-off-by: Richard Salac --- .github/workflows/integration-tests.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/integration-tests.yml b/.github/workflows/integration-tests.yml index b33ebc1f62..d8484048db 100644 --- a/.github/workflows/integration-tests.yml +++ b/.github/workflows/integration-tests.yml @@ -1574,12 +1574,13 @@ jobs: - name: Code coverage and publish results run: | + printenv | grep -vi user | grep -vi token | grep -v pass | grep -vi host | grep -v url export JAVA_HOME=$JAVA_HOME_8_${{ runner.arch }} echo Execute Code coverage task using Java 8: JAVA_HOME = $JAVA_HOME - ./gradlew --info coverage -Dresults="containercitests/results,citestswithinfinispan/results,containercitestszosmfrsu2012/results,ContainerCITestsWithRedisReplica/results,ContainerCITestsWithRedisSentinel/results,containercitestsinternalport/results,cloudgatewayproxy/results,citestswebsocketchaoticha/results,cloudgatewayservicerouting/results,containercitestszaas/results" + ./gradlew --info coverage -Dresults="containercitests/results,citestswithinfinispan/results,containercitestszosmfrsu2012/results,ContainerCITestsWithRedisReplica/results,ContainerCITestsWithRedisSentinel/results,containercitestsinternalport/results,cloudgatewayproxy/results,citestswebsocketchaoticha/results,cloudgatewayservicerouting/results,containercitestszaas/results" -Dsonar.verbose=true export JAVA_HOME=$JAVA_HOME_17_${{ runner.arch }} echo Execute Sonar scanner using Java 17: JAVA_HOME = $JAVA_HOME - ./gradlew --info sonar -Psonar.host.url=$SONAR_HOST_URL -Dsonar.token=$SONAR_TOKEN -Partifactory_user=$ARTIFACTORY_USERNAME -Partifactory_password=$ARTIFACTORY_PASSWORD + ./gradlew --info sonar -Psonar.host.url=$SONAR_HOST_URL -Dsonar.token=$SONAR_TOKEN -Partifactory_user=$ARTIFACTORY_USERNAME -Partifactory_password=$ARTIFACTORY_PASSWORD -Dsonar.verbose=true env: ARTIFACTORY_USERNAME: ${{ secrets.ARTIFACTORY_USERNAME }} ARTIFACTORY_PASSWORD: ${{ secrets.ARTIFACTORY_PASSWORD }} From 38fbe8864d8055d8de74c4186dcd5b3423c8b22b Mon Sep 17 00:00:00 2001 From: Richard Salac Date: Fri, 27 Sep 2024 13:45:32 +0200 Subject: [PATCH 2/2] remove old configuration from jenkins Signed-off-by: Richard Salac --- .github/workflows/integration-tests.yml | 5 ++--- gradle/sonar.gradle | 13 ------------- 2 files changed, 2 insertions(+), 16 deletions(-) diff --git a/.github/workflows/integration-tests.yml b/.github/workflows/integration-tests.yml index d8484048db..b33ebc1f62 100644 --- a/.github/workflows/integration-tests.yml +++ b/.github/workflows/integration-tests.yml @@ -1574,13 +1574,12 @@ jobs: - name: Code coverage and publish results run: | - printenv | grep -vi user | grep -vi token | grep -v pass | grep -vi host | grep -v url export JAVA_HOME=$JAVA_HOME_8_${{ runner.arch }} echo Execute Code coverage task using Java 8: JAVA_HOME = $JAVA_HOME - ./gradlew --info coverage -Dresults="containercitests/results,citestswithinfinispan/results,containercitestszosmfrsu2012/results,ContainerCITestsWithRedisReplica/results,ContainerCITestsWithRedisSentinel/results,containercitestsinternalport/results,cloudgatewayproxy/results,citestswebsocketchaoticha/results,cloudgatewayservicerouting/results,containercitestszaas/results" -Dsonar.verbose=true + ./gradlew --info coverage -Dresults="containercitests/results,citestswithinfinispan/results,containercitestszosmfrsu2012/results,ContainerCITestsWithRedisReplica/results,ContainerCITestsWithRedisSentinel/results,containercitestsinternalport/results,cloudgatewayproxy/results,citestswebsocketchaoticha/results,cloudgatewayservicerouting/results,containercitestszaas/results" export JAVA_HOME=$JAVA_HOME_17_${{ runner.arch }} echo Execute Sonar scanner using Java 17: JAVA_HOME = $JAVA_HOME - ./gradlew --info sonar -Psonar.host.url=$SONAR_HOST_URL -Dsonar.token=$SONAR_TOKEN -Partifactory_user=$ARTIFACTORY_USERNAME -Partifactory_password=$ARTIFACTORY_PASSWORD -Dsonar.verbose=true + ./gradlew --info sonar -Psonar.host.url=$SONAR_HOST_URL -Dsonar.token=$SONAR_TOKEN -Partifactory_user=$ARTIFACTORY_USERNAME -Partifactory_password=$ARTIFACTORY_PASSWORD env: ARTIFACTORY_USERNAME: ${{ secrets.ARTIFACTORY_USERNAME }} ARTIFACTORY_PASSWORD: ${{ secrets.ARTIFACTORY_PASSWORD }} diff --git a/gradle/sonar.gradle b/gradle/sonar.gradle index e1f1fd8e54..b91e4a74d8 100644 --- a/gradle/sonar.gradle +++ b/gradle/sonar.gradle @@ -1,7 +1,5 @@ apply plugin: "org.sonarqube" -ext.pullRequest = System.getenv()['CHANGE_ID'] ?: null - sonar { properties { property "sonar.host.url", project.getProperty('sonar.host.url') @@ -13,18 +11,7 @@ sonar { property "sonar.projectVersion", project.version property "sonar.language", "java" property "sonar.links.scm", "https://github.com/zowe/api-layer" - property "sonar.links.ci", System.getenv()['BUILD_URL'] ?: null property "sonar.scanner.force-deprecated-java-version", true - if (pullRequest != null) { - property "sonar.pullrequest.key", System.getenv()['CHANGE_ID'] ?: null - property "sonar.pullrequest.branch", System.getenv()['CHANGE_BRANCH'] ?: null - property "sonar.pullrequest.base", System.getenv()['CHANGE_TARGET'] ?: null - property "sonar.github.pullRequest", pullRequest - property "sonar.github.repository", "zowe/api-layer" - property "sonar.github.oauth", project.hasProperty('sonar.github.oauth') ? project.getProperty('sonar.github.oauth') : null - } else { - property "sonar.branch.name", System.getenv()['BRANCH_NAME'] ?: null - } } }