From 768003e07199845c8a8e1540bb0edba268a89a6e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ra=C3=BAl=20Arabaolaza=20Barquin?= Date: Mon, 1 Apr 2024 17:30:41 +0200 Subject: [PATCH] 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 --- pom.xml | 10 +++++----- .../steps/durable_task/DurableTaskStepTest.java | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/pom.xml b/pom.xml index 2e7120f6..eabd17e1 100644 --- a/pom.xml +++ b/pom.xml @@ -66,9 +66,9 @@ 999999-SNAPSHOT - 2.387.3 - - 2042.v787a_641a_9b_26 + + 2182.v0138ccb_c0b_cb_ + 2.440.1 true jenkinsci/${project.artifactId}-plugin 2.40 @@ -77,8 +77,8 @@ io.jenkins.tools.bom - bom-2.387.x - 2378.v3e03930028f2 + bom-2.440.x + 2907.vcb_35d6f2f7de import pom diff --git a/src/test/java/org/jenkinsci/plugins/workflow/steps/durable_task/DurableTaskStepTest.java b/src/test/java/org/jenkinsci/plugins/workflow/steps/durable_task/DurableTaskStepTest.java index 5358e820..6e64aa40 100644 --- a/src/test/java/org/jenkinsci/plugins/workflow/steps/durable_task/DurableTaskStepTest.java +++ b/src/test/java/org/jenkinsci/plugins/workflow/steps/durable_task/DurableTaskStepTest.java @@ -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); }