Skip to content

Commit

Permalink
Fix tests for IPV6 (#362)
Browse files Browse the repository at this point in the history
* 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
  • Loading branch information
raul-arabaolaza committed Apr 1, 2024
1 parent ab0869f commit 768003e
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 deletions.
10 changes: 5 additions & 5 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -66,9 +66,9 @@
</pluginRepositories>
<properties>
<changelist>999999-SNAPSHOT</changelist>
<jenkins.version>2.387.3</jenkins.version>
<!-- TODO until in plugin-pom -->
<jenkins-test-harness.version>2042.v787a_641a_9b_26</jenkins-test-harness.version>
<!-- TODO Until in plugin-pom -->
<jenkins-test-harness.version>2182.v0138ccb_c0b_cb_</jenkins-test-harness.version>
<jenkins.version>2.440.1</jenkins.version>
<useBeta>true</useBeta>
<gitHubRepo>jenkinsci/${project.artifactId}-plugin</gitHubRepo>
<hpi.compatibleSinceVersion>2.40</hpi.compatibleSinceVersion>
Expand All @@ -77,8 +77,8 @@
<dependencies>
<dependency>
<groupId>io.jenkins.tools.bom</groupId>
<artifactId>bom-2.387.x</artifactId>
<version>2378.v3e03930028f2</version>
<artifactId>bom-2.440.x</artifactId>
<version>2907.vcb_35d6f2f7de</version>
<scope>import</scope>
<type>pom</type>
</dependency>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -109,9 +109,9 @@ private static void scriptExitingAcrossRestart1(JenkinsRule r) throws Throwable
var p = r.createProject(WorkflowJob.class, "p");
var f = new File(r.jenkins.getRootDir(), "f");
p.addProperty(new ParametersDefinitionProperty(new StringParameterDefinition("F")));
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));
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));
var b = p.scheduleBuild2(0, new ParametersAction(new StringParameterValue("F", f.getAbsolutePath()))).waitForStart();
r.waitForMessage(Functions.isWindows() ? ">ping -n 5 localhost" : "+ sleep 5", b);
r.waitForMessage(Functions.isWindows() ? ">ping -n 5 " + r.getURL().getHost() : "+ sleep 5", b);
r.jenkins.doQuietDown(true, 0, null);
}

Expand Down

0 comments on commit 768003e

Please sign in to comment.