441648: support Hudson 3.2.1 and Jenkins 1.565.3, 1.580.1
Change-Id: I10f6558326d66e7b3b3f492d7f345f9b402e6ce5
Task-Url: https://bugs.eclipse.org/bugs/show_bug.cgi?id=441648
Signed-off-by: Sam Davis <sam.davis@tasktop.com>
diff --git a/org.eclipse.mylyn.hudson.releng/modules/hudson/manifests/defaultsites.pp b/org.eclipse.mylyn.hudson.releng/modules/hudson/manifests/defaultsites.pp
index e9ca565..b8bd79e 100644
--- a/org.eclipse.mylyn.hudson.releng/modules/hudson/manifests/defaultsites.pp
+++ b/org.eclipse.mylyn.hudson.releng/modules/hudson/manifests/defaultsites.pp
@@ -13,69 +13,57 @@
/* Instances */
- hudson::hudson { "3.0.1":
- type => "hudson",
- qualifier => "eclipse",
- }
-
hudson::hudson { "3.1.2":
type => "hudson",
qualifier => "eclipse",
}
- hudson::hudson { "1.554.3":
+ hudson::hudson { "3.2.1":
+ type => "hudson",
+ qualifier => "eclipse",
+ }
+
+ hudson::hudson { "1.565.3":
type => "jenkins",
qualifier => "stable",
}
- hudson::hudson { "1.565.1":
+ hudson::hudson { "1.580.1":
type => "jenkins",
qualifier => "stable",
}
- hudson::hudson { "jenkins-latest":
- type => "jenkins",
- qualifier => "latest",
- }
-
/* Sites */
- hudson::site { "hudson-3.0.1":
- envtype => "hudson",
- version => "3.0.1",
- port => 9031,
- require => Hudson["3.0.1"],
- }
-
hudson::site { "hudson-3.1.2":
envtype => "hudson",
version => "3.1.2",
port => 9042,
- envdefault => true,
require => Hudson["3.1.2"],
}
- hudson::site { "jenkins-1.554.3":
- envtype => "jenkins",
- version => "1.554.3",
- port => 9134,
- require => Hudson["1.554.3"],
- }
-
- hudson::site { "jenkins-1.565.1":
- envtype => "jenkins",
- version => "1.565.1",
- port => 9565,
+ hudson::site { "hudson-3.2.1":
+ envtype => "hudson",
+ version => "3.2.1",
+ port => 9321,
envdefault => true,
- require => Hudson["1.565.1"],
+ require => Hudson["3.2.1"],
}
- hudson::site { "jenkins-latest":
+ hudson::site { "jenkins-1.565.3":
envtype => "jenkins",
- version => "jenkins-latest",
- port => 9110,
- require => Hudson["jenkins-latest"],
+ version => "1.565.3",
+ port => 9565,
+ require => Hudson["1.565.3"],
+ }
+
+ hudson::site { "jenkins-1.580.1":
+ envtype => "jenkins",
+ version => "1.580.1",
+ port => 9580,
+ envdefault => true,
+ require => Hudson["1.580.1"],
}
}
\ No newline at end of file