remove old configuration from jenkins

Signed-off-by: Richard Salac <[email protected]>
zowe · Sep 27, 2024 · 38fbe88 · 38fbe88
1 parent 09af2fe
commit 38fbe88
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 16 deletions.
diff --git 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
@@ -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
-        }
     }
 }