From dc2987e3db3407a1e37252f2e962536091883fab Mon Sep 17 00:00:00 2001 From: Alessandro Solimando Date: Fri, 19 Jul 2024 11:04:21 +0200 Subject: [PATCH] lower memory and suppressed sonar warning --- Jenkinsfile | 4 ++-- gradle.properties | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 7ff37aba28cd..cc422cc2680b 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -44,9 +44,9 @@ node('ubuntu') { withEnv(["Path+JDK=$JAVA_JDK_17/bin","JAVA_HOME=$JAVA_JDK_17"]) { withCredentials([string(credentialsId: 'SONARCLOUD_TOKEN', variable: 'SONAR_TOKEN')]) { if ( env.BRANCH_NAME.startsWith("PR-") ) { - sh './gradlew --no-parallel --no-daemon jacocoAggregateTestReport sonar -PenableJacoco -Porg.sonarqube.version=4.4.1.3373 -Dsonar.pullrequest.branch=${CHANGE_BRANCH} -Dsonar.pullrequest.base=${CHANGE_TARGET} -Dsonar.pullrequest.key=${CHANGE_ID} -Dsonar.login=${SONAR_TOKEN}' + sh './gradlew build --no-parallel --no-daemon jacocoAggregateTestReport sonar -PenableJacoco -Porg.sonarqube.version=4.4.1.3373 -Dsonar.pullrequest.branch=${CHANGE_BRANCH} -Dsonar.pullrequest.base=${CHANGE_TARGET} -Dsonar.pullrequest.key=${CHANGE_ID} -Dsonar.login=${SONAR_TOKEN}' } else { - sh './gradlew --no-parallel --no-daemon jacocoAggregateTestReport sonar -PenableJacoco -Porg.sonarqube.version=4.4.1.3373 -Dsonar.branch.name=${BRANCH_NAME} -Dsonar.login=${SONAR_TOKEN}' + sh './gradlew build --no-parallel --no-daemon jacocoAggregateTestReport sonar -PenableJacoco -Porg.sonarqube.version=4.4.1.3373 -Dsonar.branch.name=${BRANCH_NAME} -Dsonar.login=${SONAR_TOKEN}' } } } diff --git a/gradle.properties b/gradle.properties index 69382d2b235f..2480acbeec19 100644 --- a/gradle.properties +++ b/gradle.properties @@ -14,7 +14,7 @@ # See the License for the specific language governing permissions and # limitations under the License. # -org.gradle.jvmargs=-XX:+UseG1GC -Xmx1536m -XX:MaxMetaspaceSize=768m +org.gradle.jvmargs=-XX:+UseG1GC -Xmx512m -XX:MaxMetaspaceSize=512m org.gradle.parallel=true # Build cache can be disabled with --no-build-cache option org.gradle.caching=true @@ -173,6 +173,7 @@ xalan.version=2.7.1 xercesImpl.version=2.9.1 # sonar properties +systemProp.sonar.gradle.skipCompile=true +systemProp.sonar.host.url=https://sonarcloud.io systemProp.sonar.organization=apache systemProp.sonar.projectKey=apache_calcite -systemProp.sonar.host.url=https://sonarcloud.io