Simplify required configuration for `KubernetesPipelineTest#garbageCo…

…llection` (#1551)
jenkinsci · May 14, 2024 · 40ff98c · 40ff98c
1 parent 9e58a7c
commit 40ff98c
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/pom.xml b/pom.xml
@@ -295,7 +295,6 @@
           <systemPropertyVariables>
             <hudson.slaves.NodeProvisioner.initialDelay>0</hudson.slaves.NodeProvisioner.initialDelay>
             <hudson.slaves.NodeProvisioner.recurrencePeriod>3000</hudson.slaves.NodeProvisioner.recurrencePeriod>
-            <org.csanchez.jenkins.plugins.kubernetes.GarbageCollection.recurrencePeriod>5</org.csanchez.jenkins.plugins.kubernetes.GarbageCollection.recurrencePeriod>
             <org.jenkinsci.plugins.workflow.support.pickles.ExecutorPickle.timeoutForNodeMillis>60000</org.jenkinsci.plugins.workflow.support.pickles.ExecutorPickle.timeoutForNodeMillis>
             <!-- listen in this interface for connections from kubernetes pods -->
             <connectorHost>${connectorHost}</connectorHost>

diff --git a/src/main/java/org/csanchez/jenkins/plugins/kubernetes/GarbageCollection.java b/src/main/java/org/csanchez/jenkins/plugins/kubernetes/GarbageCollection.java
@@ -45,7 +45,8 @@ public class GarbageCollection extends AbstractDescribableImpl<GarbageCollection
     private int timeout;
 
     private static Long RECURRENCE_PERIOD = SystemProperties.getLong(
-            GarbageCollection.class.getName() + ".recurrencePeriod", TimeUnit.MINUTES.toSeconds(1));
+            GarbageCollection.class.getName() + ".recurrencePeriod",
+            Main.isUnitTest ? 5 : TimeUnit.MINUTES.toSeconds(1));
 
     @DataBoundConstructor
     public GarbageCollection() {}