From 82ded4d6754ff3f27500d68ebde3e6bc446a1f2d Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Mon, 28 Mar 2011 16:52:10 -0700 Subject: [PATCH 1/5] Using the latest Jetty to avoid a race condition that can create occasional test failures. See JETTY-1149. --- pom.xml | 6 +++--- test/pom.xml | 2 +- war/pom.xml | 14 +++++++------- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/pom.xml b/pom.xml index 329d1ca7ea..99b3e570fe 100644 --- a/pom.xml +++ b/pom.xml @@ -241,9 +241,9 @@ THE SOFTWARE. Since some developers try to run hudson-dev:run from main, define it here so that at least the plugin resolves. This enables us to report a better error message. --> - org.jvnet.hudson.tools - maven-hudson-dev-plugin - 6.1.7 + org.jenkins-ci.tools + maven-jenkins-dev-plugin + 6.1.26-jenkins-1 - org.jvnet.hudson.tools - maven-hudson-dev-plugin - 6.1.7-hudson-1 + org.jenkins-ci.tools + maven-jenkins-dev-plugin + 6.1.26-jenkins-1 ${contextPath} + + manual ${port} @@ -152,10 +156,6 @@ THE SOFTWARE. ../core/src/main/resources true - - true default From a6520d813eeddddbaf1da4ecba671453de8774cc Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Mon, 28 Mar 2011 19:19:46 -0700 Subject: [PATCH 2/5] avoid a hang --- test/src/main/java/org/jvnet/hudson/test/HudsonTestCase.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/test/src/main/java/org/jvnet/hudson/test/HudsonTestCase.java b/test/src/main/java/org/jvnet/hudson/test/HudsonTestCase.java index b8fe24fae5..44026c6a67 100644 --- a/test/src/main/java/org/jvnet/hudson/test/HudsonTestCase.java +++ b/test/src/main/java/org/jvnet/hudson/test/HudsonTestCase.java @@ -1457,6 +1457,10 @@ public abstract class HudsonTestCase extends TestCase implements RootAction { public void contextReleased(Context cx) { } }); + + // avoid a hang by setting a time out. It should be long enough to prevent + // false-positive timeout on slow systems + setTimeout(60*1000); } /** From cabe8987bb58e95e2563085346f48d4a16473353 Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Mon, 28 Mar 2011 21:30:59 -0700 Subject: [PATCH 3/5] set a very conservative time out to avoid a hang --- core/src/main/java/hudson/tools/JDKInstaller.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/core/src/main/java/hudson/tools/JDKInstaller.java b/core/src/main/java/hudson/tools/JDKInstaller.java index cdca2a34f5..5f28d78aa4 100644 --- a/core/src/main/java/hudson/tools/JDKInstaller.java +++ b/core/src/main/java/hudson/tools/JDKInstaller.java @@ -308,7 +308,9 @@ public class JDKInstaller extends ToolInstaller { IOUtils.copy(new RetryableHttpStream(src) { @Override protected HttpURLConnection connect() throws IOException { - return (HttpURLConnection) ProxyConfiguration.open(url); + HttpURLConnection con = (HttpURLConnection) ProxyConfiguration.open(url); + con.setReadTimeout(60*1000); // don't block forever, but don't let the slow client fail with false positives either + return con; } }, out); } finally { From 0cab76ae1ffd445cce7d053473c550219f0d81eb Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Mon, 28 Mar 2011 21:32:58 -0700 Subject: [PATCH 4/5] Jenkins --- core/src/main/java/hudson/EnvVars.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/src/main/java/hudson/EnvVars.java b/core/src/main/java/hudson/EnvVars.java index 3cb2afe340..56678ab7dc 100644 --- a/core/src/main/java/hudson/EnvVars.java +++ b/core/src/main/java/hudson/EnvVars.java @@ -185,7 +185,7 @@ public class EnvVars extends TreeMap { * when we later kill the processes. */ public static EnvVars createCookie() { - return new EnvVars("HUDSON_COOKIE", UUID.randomUUID().toString()); + return new EnvVars("JENKINS_COOKIE", UUID.randomUUID().toString()); } /** From 40983bac81df783cbf07ecfc5b1a71c444c00c79 Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Tue, 29 Mar 2011 09:00:18 -0700 Subject: [PATCH 5/5] also exposes JENKINS_URL --- core/src/main/java/hudson/slaves/CommandLauncher.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/core/src/main/java/hudson/slaves/CommandLauncher.java b/core/src/main/java/hudson/slaves/CommandLauncher.java index 5384592d9d..c0c8230fc2 100644 --- a/core/src/main/java/hudson/slaves/CommandLauncher.java +++ b/core/src/main/java/hudson/slaves/CommandLauncher.java @@ -101,7 +101,8 @@ public class CommandLauncher extends ComputerLauncher { {// system defined variables String rootUrl = Hudson.getInstance().getRootUrl(); if (rootUrl!=null) { - pb.environment().put("HUDSON_URL", rootUrl); + pb.environment().put("HUDSON_URL", rootUrl); // for backward compatibility + pb.environment().put("JENKINS_URL", rootUrl); pb.environment().put("SLAVEJAR_URL", rootUrl+"/jnlpJars/slave.jar"); } }