Skip to content

Commit 768003e

Browse files
Fix tests for IPV6 (#362)
* Remove override of the JTH version `plugin-pom` already contains a higher version than the one required and the override prevents it from being updated transitively on parent updates * Update core and BOm to 2.440.1 Bump core version * Update JTH
1 parent ab0869f commit 768003e

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed

pom.xml

+5-5
Original file line numberDiff line numberDiff line change
@@ -66,9 +66,9 @@
6666
</pluginRepositories>
6767
<properties>
6868
<changelist>999999-SNAPSHOT</changelist>
69-
<jenkins.version>2.387.3</jenkins.version>
70-
<!-- TODO until in plugin-pom -->
71-
<jenkins-test-harness.version>2042.v787a_641a_9b_26</jenkins-test-harness.version>
69+
<!-- TODO Until in plugin-pom -->
70+
<jenkins-test-harness.version>2182.v0138ccb_c0b_cb_</jenkins-test-harness.version>
71+
<jenkins.version>2.440.1</jenkins.version>
7272
<useBeta>true</useBeta>
7373
<gitHubRepo>jenkinsci/${project.artifactId}-plugin</gitHubRepo>
7474
<hpi.compatibleSinceVersion>2.40</hpi.compatibleSinceVersion>
@@ -77,8 +77,8 @@
7777
<dependencies>
7878
<dependency>
7979
<groupId>io.jenkins.tools.bom</groupId>
80-
<artifactId>bom-2.387.x</artifactId>
81-
<version>2378.v3e03930028f2</version>
80+
<artifactId>bom-2.440.x</artifactId>
81+
<version>2907.vcb_35d6f2f7de</version>
8282
<scope>import</scope>
8383
<type>pom</type>
8484
</dependency>

src/test/java/org/jenkinsci/plugins/workflow/steps/durable_task/DurableTaskStepTest.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -109,9 +109,9 @@ private static void scriptExitingAcrossRestart1(JenkinsRule r) throws Throwable
109109
var p = r.createProject(WorkflowJob.class, "p");
110110
var f = new File(r.jenkins.getRootDir(), "f");
111111
p.addProperty(new ParametersDefinitionProperty(new StringParameterDefinition("F")));
112-
p.setDefinition(new CpsFlowDefinition("node('remote') {if (isUnix()) {sh 'sleep 5 && touch \"$F\"'} else {bat 'ping -n 5 localhost && copy nul \"%F%\" && dir \"%F%\"'}}", true));
112+
p.setDefinition(new CpsFlowDefinition("node('remote') {if (isUnix()) {sh 'sleep 5 && touch \"$F\"'} else {bat 'ping -n 5 " + r.getURL().getHost() + " && copy nul \"%F%\" && dir \"%F%\"'}}", true));
113113
var b = p.scheduleBuild2(0, new ParametersAction(new StringParameterValue("F", f.getAbsolutePath()))).waitForStart();
114-
r.waitForMessage(Functions.isWindows() ? ">ping -n 5 localhost" : "+ sleep 5", b);
114+
r.waitForMessage(Functions.isWindows() ? ">ping -n 5 " + r.getURL().getHost() : "+ sleep 5", b);
115115
r.jenkins.doQuietDown(true, 0, null);
116116
}
117117

0 commit comments

Comments
 (0)