416581: add Hudson 3.1 to test fixtures

* Remove Hudson 2.1 since it's no longer supported

Change-Id: Icb369d380bea4e4ab99858d85994bd29760a61b9
Task-Url: https://bugs.eclipse.org/bugs/show_bug.cgi?id=416581
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 ade06a3..7558507 100644
--- a/org.eclipse.mylyn.hudson.releng/modules/hudson/manifests/defaultsites.pp
+++ b/org.eclipse.mylyn.hudson.releng/modules/hudson/manifests/defaultsites.pp
@@ -12,10 +12,6 @@
 
   /* Instances */
 
-  hudson::hudson { "2.1.0":
-    type => "hudson",
-  }
-
   hudson::hudson { "2.2.1":
     type => "hudson",
   }
@@ -30,6 +26,11 @@
     qualifier => "eclipse",
   }
 
+  hudson::hudson { "3.1.0":
+    type      => "hudson",
+    qualifier => "eclipse",
+  }
+
   hudson::hudson { "1.466.2":
     type      => "jenkins",
     qualifier => "stable",
@@ -40,7 +41,7 @@
     qualifier => "stable",
   }
 
-  hudson::hudson { "1.509.2":
+  hudson::hudson { "1.509.3":
     type      => "jenkins",
     qualifier => "stable",
   }
@@ -52,13 +53,6 @@
 
   /* Sites */
 
-  hudson::site { "hudson-2.1.0":
-    envtype => "hudson",
-    version => "2.1.0",
-    port    => 9010,
-    require => Hudson["2.1.0"],
-  }
-
   hudson::site { "hudson-2.2.1":
     envtype => "hudson",
     version => "2.2.1",
@@ -81,6 +75,13 @@
     require => Hudson["3.0.1"],
   }
 
+  hudson::site { "hudson-3.1.0":
+    envtype => "hudson",
+    version => "3.1.0",
+    port    => 9041,
+    require => Hudson["3.1.0"],
+  }
+
   hudson::site { "jenkins-1.466.2":
     envtype => "jenkins",
     version => "1.466.2",
@@ -95,12 +96,12 @@
     require => Hudson["1.480.3"],
   }
 
-  hudson::site { "jenkins-1.509.2":
+  hudson::site { "jenkins-1.509.3":
     envtype => "jenkins",
-    version => "1.509.2",
-    port    => 9131,
+    version => "1.509.3",
+    port    => 9133,
     envdefault => true,
-    require => Hudson["1.509.2"],
+    require => Hudson["1.509.3"],
   }
 
   hudson::site { "jenkins-latest":