Add gradle cleanup before the checks

Signed-off-by: Peter Zhu <zhujiaxi@amazon.com>
opensearch-project · Jun 29, 2022 · ad33c8a · ad33c8a
1 parent a3d26d0
commit ad33c8a
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/tests/jenkins/jobs/RunGradleCheck_Jenkinsfile.txt b/tests/jenkins/jobs/RunGradleCheck_Jenkinsfile.txt
@@ -37,9 +37,9 @@
 
                 env | grep JAVA | grep HOME
 
-                echo "Stop existing gradledaemon"
+                echo "Gradle clean cache and stop existing gradledaemon"
                 ./gradlew --stop
-                find ~/.gradle -type f -name "*.lock" -delete
+                rm -rf ~/.gradle
 
                 echo "Check existing dockercontainer"
                 docker ps -a
@@ -59,7 +59,7 @@
 
                 echo "Start gradlecheck"
                 GRADLE_CHECK_STATUS=0
-                ./gradlew check -Dtests.coverage=true --no-daemon --no-scan || GRADLE_CHECK_STATUS=1
+                ./gradlew clean && ./gradlew check -Dtests.coverage=true --no-daemon --no-scan || GRADLE_CHECK_STATUS=1
 
                 if [ "$GRADLE_CHECK_STATUS" != 0 ]; then
                     echo Gradle Check Failed!

diff --git a/vars/runGradleCheck.groovy b/vars/runGradleCheck.groovy
@@ -43,9 +43,9 @@ void call(Map args = [:]) {
 
                 env | grep JAVA | grep HOME
 
-                echo "Stop existing gradledaemon"
+                echo "Gradle clean cache and stop existing gradledaemon"
                 ./gradlew --stop
-                find ~/.gradle -type f -name "*.lock" -delete
+                rm -rf ~/.gradle
 
                 echo "Check existing dockercontainer"
                 docker ps -a
@@ -65,7 +65,7 @@ void call(Map args = [:]) {
 
                 echo "Start gradlecheck"
                 GRADLE_CHECK_STATUS=0
-                ./gradlew check -Dtests.coverage=true --no-daemon --no-scan || GRADLE_CHECK_STATUS=1
+                ./gradlew clean && ./gradlew check -Dtests.coverage=true --no-daemon --no-scan || GRADLE_CHECK_STATUS=1
 
                 if [ "\$GRADLE_CHECK_STATUS" != 0 ]; then
                     echo Gradle Check Failed!