Skip to content

Commit 40ff98c

Browse files
authored
Simplify required configuration for KubernetesPipelineTest#garbageCollection (#1551)
1 parent 9e58a7c commit 40ff98c

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

pom.xml

-1
Original file line numberDiff line numberDiff line change
@@ -295,7 +295,6 @@
295295
<systemPropertyVariables>
296296
<hudson.slaves.NodeProvisioner.initialDelay>0</hudson.slaves.NodeProvisioner.initialDelay>
297297
<hudson.slaves.NodeProvisioner.recurrencePeriod>3000</hudson.slaves.NodeProvisioner.recurrencePeriod>
298-
<org.csanchez.jenkins.plugins.kubernetes.GarbageCollection.recurrencePeriod>5</org.csanchez.jenkins.plugins.kubernetes.GarbageCollection.recurrencePeriod>
299298
<org.jenkinsci.plugins.workflow.support.pickles.ExecutorPickle.timeoutForNodeMillis>60000</org.jenkinsci.plugins.workflow.support.pickles.ExecutorPickle.timeoutForNodeMillis>
300299
<!-- listen in this interface for connections from kubernetes pods -->
301300
<connectorHost>${connectorHost}</connectorHost>

src/main/java/org/csanchez/jenkins/plugins/kubernetes/GarbageCollection.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,8 @@ public class GarbageCollection extends AbstractDescribableImpl<GarbageCollection
4545
private int timeout;
4646

4747
private static Long RECURRENCE_PERIOD = SystemProperties.getLong(
48-
GarbageCollection.class.getName() + ".recurrencePeriod", TimeUnit.MINUTES.toSeconds(1));
48+
GarbageCollection.class.getName() + ".recurrencePeriod",
49+
Main.isUnitTest ? 5 : TimeUnit.MINUTES.toSeconds(1));
4950

5051
@DataBoundConstructor
5152
public GarbageCollection() {}

0 commit comments

Comments
 (0)