Gradle: turn off daemon for Windows build, clean up.

Author: greenrobot-team

Jenkinsfile

@@ -1,5 +1,3 @@
-def COLOR_MAP = ['SUCCESS': 'good', 'FAILURE': 'danger', 'UNSTABLE': 'danger', 'ABORTED': 'danger']
-
 // dev branch only: every 30 minutes at night (1:00 - 5:00)
 String cronSchedule = BRANCH_NAME == 'dev' ? '*/30 1-5 * * *' : ''
 String buildsToKeep = '500'
@@ -42,6 +40,7 @@ pipeline {
         stage('init') {
             steps {
                 sh 'chmod +x gradlew'
+                sh 'chmod +x ci/test-with-asan.sh'
                 sh './gradlew -version'
 
                 // "|| true" for an OK exit code if no file is found
@@ -51,8 +50,7 @@ pipeline {
 
         stage('build-java') {
             steps {
-                sh "./test-with-asan.sh -Dextensive-tests=true $MVN_REPO_ARGS " +
-                        "clean test " +
+                sh "./ci/test-with-asan.sh $gradleArgs $MVN_REPO_ARGS -Dextensive-tests=true clean test " +
                         "--tests io.objectbox.FunctionalTestSuite " +
                         "--tests io.objectbox.test.proguard.ObfuscatedEntityTest " +
                         "--tests io.objectbox.rx.QueryObserverTest " +

ci/Jenkinsfile-Windows

@@ -1,7 +1,7 @@
-def COLOR_MAP = ['SUCCESS': 'good', 'FAILURE': 'danger', 'UNSTABLE': 'danger', 'ABORTED': 'danger']
-
 String buildsToKeep = '500'
 
+String gradleArgs = '-Dorg.gradle.daemon=false --stacktrace'
+
 // https://jenkins.io/doc/book/pipeline/syntax/
 pipeline {
     agent { label 'windows' }
@@ -10,6 +10,9 @@ pipeline {
         GITLAB_URL = credentials('gitlab_url')
         MVN_REPO_URL = credentials('objectbox_internal_mvn_repo_http')
         MVN_REPO_LOGIN = credentials('objectbox_internal_mvn_user')
+        MVN_REPO_ARGS = "-PinternalObjectBoxRepo=$MVN_REPO_URL " +
+                        "-PinternalObjectBoxRepoUser=$MVN_REPO_LOGIN_USR " +
+                        "-PinternalObjectBoxRepoPassword=$MVN_REPO_LOGIN_PSW"
     }
 
     options {
@@ -34,9 +37,7 @@ pipeline {
 
         stage('build-java') {
             steps {
-                bat "gradlew " +
-                 "-PinternalObjectBoxRepo=${MVN_REPO_URL} -PinternalObjectBoxRepoUser=${MVN_REPO_LOGIN_USR} -PinternalObjectBoxRepoPassword=${MVN_REPO_LOGIN_PSW} " +
-                 "cleanTest build test"
+                bat "gradlew $gradleArgs $MVN_REPO_ARGS cleanTest build test"
             }
         }
     }

test-with-asan.sh ci/test-with-asan.shtest-with-asan.sh renamed to ci/test-with-asan.sh

@@ -25,12 +25,6 @@ else
     args=$@
 fi
 echo "Starting Gradle for target(s) \"$args\"..."
+pwd
 
-user=$(whoami)
-if [[ ${user} == "jenkinsXXX-DISABLED-TO-TEST" ]]; then
-    echo "WARNING!! USING GRADLE DAEMON ON JENKINS (VS. ASAN)"
-    LD_PRELOAD=${ASAN_LIB_SO} ./gradlew --stacktrace ${args}
-else
-    echo "Starting Gradle without daemon"
-    LD_PRELOAD=${ASAN_LIB_SO} ./gradlew -Dorg.gradle.daemon=false --stacktrace ${args}
-fi
+LD_PRELOAD=${ASAN_LIB_SO} ./gradlew ${args}