Fix Gradle daemon cleanup on Windows (#489)

jenkinsci · Sep 25, 2024 · ed19cd6 · ed19cd6
1 parent 13ca6c6
commit ed19cd6
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 1 deletion.
diff --git a/src/test/groovy/hudson/plugins/gradle/BaseGradleIntegrationTest.groovy b/src/test/groovy/hudson/plugins/gradle/BaseGradleIntegrationTest.groovy
@@ -64,4 +64,20 @@ abstract class BaseGradleIntegrationTest extends AbstractIntegrationTest {
         CredentialsProvider.lookupStores(j.jenkins).iterator().next().addCredentials(Domain.global(), creds)
     }
 
+    @SuppressWarnings("CatchException")
+    def cleanup() {
+        if(Functions.isWindows()) {
+            try {
+                println 'Killing Gradle processes'
+                def proc = '''WMIC PROCESS where "Name like 'java%' AND CommandLine like '%hudson.plugins.gradle.GradleInstallation%'" Call Terminate"'''.execute()
+                proc.waitFor(30, TimeUnit.SECONDS)
+                println "output: ${proc.text}"
+                println "code: ${proc.exitValue()}"
+            } catch (Exception e) {
+                System.err.println('Failed killing Gradle daemons')
+                e.printStackTrace()
+            }
+        }
+    }
+
 }
diff --git a/...est/groovy/hudson/plugins/gradle/injection/BuildScanInjectionGradleIntegrationTest.groovy b/...est/groovy/hudson/plugins/gradle/injection/BuildScanInjectionGradleIntegrationTest.groovy
@@ -30,7 +30,7 @@ class BuildScanInjectionGradleIntegrationTest extends BaseGradleIntegrationTest
 
     private static final String MSG_INIT_SCRIPT_APPLIED = "Connection to Develocity: http://foo.com"
 
-    private static final List<String> GRADLE_VERSIONS = ['4.10.3', '5.6.4', '6.9.4', '7.6.4', '8.6']
+    private static final List<String> GRADLE_VERSIONS = ['4.10.3', '5.6.4', '6.9.4', '7.6.4', '8.9']
 
     private static final EnvVars EMPTY_ENV = new EnvVars()