458453: update of Bugzilla to Version 5.0rc2, 4.4.8, 4.2.13, and 4.0.17

Change-Id: I9caf143ac40c28436b1065b6f1f3c9143baa1324
Task-Url: https://bugs.eclipse.org/bugs/show_bug.cgi?id=458453

3 files changed, 35 insertions, 30 deletions

diff --git a/org.eclipse.mylyn.bugzilla.releng/modules/bugzilla/manifests/defaultsites.pp b/org.eclipse.mylyn.bugzilla.releng/modules/bugzilla/manifests/defaultsites.pp
index 7a74304fa..feea33337 100644
--- a/org.eclipse.mylyn.bugzilla.releng/modules/bugzilla/manifests/defaultsites.pp
+++ b/org.eclipse.mylyn.bugzilla.releng/modules/bugzilla/manifests/defaultsites.pp
@@ -23,78 +23,81 @@ define bugzilla::defaultsites($base = $bugzilla::bugzillaBase, $userOwner = $bug
   
   /* Sites */
 
-  bugzilla::site { "bugzilla-4.0.15":
+  bugzilla::site { "bugzilla-4.0.17":
     major   => "4",
     minor   => "0",
   }
 
-  bugzilla::site { "bugzilla-4.2.11":
+  bugzilla::site { "bugzilla-4.2.13":
     major   => "4",
     minor   => "2",
   }
 
-  bugzilla::site { "bugzilla-4.2.11-bugaliases":
+  bugzilla::site { "bugzilla-4.2.13-bugaliases":
     major   => "4",
     minor   => "2",
-    branchTag      => "bugzilla-4.2.11",
+    branchTag      => "bugzilla-4.2.13",
     usebugaliases => true,
   }
 
-  bugzilla::site { "bugzilla-4.4.6":
+  bugzilla::site { "bugzilla-4.4.8":
     major     => "4",
     minor     => "4",
     envdefault => true,
   }
 
-  bugzilla::site { "bugzilla-4.4.6-custom-wf":
+  bugzilla::site { "bugzilla-4.4.8-custom-wf":
     major       => "4",
     minor       => "4",
-    branchTag   => "bugzilla-4.4.6",
+    branchTag   => "bugzilla-4.4.8",
     custom_wf   => true,
   }
 
-  bugzilla::site { "bugzilla-4.4.6-custom-wf-and-status":
+  bugzilla::site { "bugzilla-4.4.8-custom-wf-and-status":
     major                => "4",
     minor                => "4",
-    branchTag            => "bugzilla-4.4.6",
+    branchTag            => "bugzilla-4.4.8",
     custom_wf_and_status => true,
   }
 
-/*
-  bugzilla::site { "bugzilla-master":
+  bugzilla::site { "bugzilla-5.0rc2":
     major       => "5",
-    minor       => "1",
-    branchTag   => "HEAD",
-    envversion   => "5.1",
+    minor       => "0",
+    branch      => "5.0",
+    envversion   => "5.0rc2",
   }
 
-  bugzilla::site { "bugzilla-rest-master":
-    major        => "5",
-    minor        => "1",
+  bugzilla::site { "bugzilla-master":
+    major       => "5",
+    minor       => "1",
     branchTag   => "HEAD",
     envversion   => "5.1",
-    envtype      => "bugzillaREST",
-    rest_enabled => true,
   }
-*/
 
-  bugzilla::site { "bugzilla-5.0":
-    major       => "5",
-    minor       => "0",
-    branch      => "5.0",
-    branchTag   => "5.0",
-    envversion   => "4.5.6+",
-  }
+/*******************************************************************************
+ * REST sites
+ *******************************************************************************/
 
-  bugzilla::site { "bugzilla-5.0-rest":
+  bugzilla::site { "bugzilla-5.0rc2-rest":
     major       => "5",
     minor       => "0",
     branch      => "5.0",
-    branchTag   => "5.0",
+    branchTag   => "bugzilla-5.0rc2",
     envtype      => "bugzillaREST",
     rest_enabled => true,
     envdefault_rest => true,
-    envversion   => "4.5.6+",
+    envversion   => "5.0rc2",
+    testdataVersion => "Version1",
+  }
+ 
+  bugzilla::site { "bugzilla-rest-master":
+    major        => "5",
+    minor        => "1",
+    branchTag   => "HEAD",
+    envversion   => "5.1",
+    envtype      => "bugzillaREST",
+    rest_enabled => true,
+    testdataVersion => "Version1",
   }
 
 }
\ No newline at end of file
diff --git a/org.eclipse.mylyn.bugzilla.releng/modules/bugzilla/manifests/site.pp b/org.eclipse.mylyn.bugzilla.releng/modules/bugzilla/manifests/site.pp
index 0685316bf..af9b7d43c 100644
--- a/org.eclipse.mylyn.bugzilla.releng/modules/bugzilla/manifests/site.pp
+++ b/org.eclipse.mylyn.bugzilla.releng/modules/bugzilla/manifests/site.pp
@@ -35,6 +35,7 @@ define bugzilla::site (
   $clearMode            = $bugzilla::clearMode,
   $rest_enabled         = false,
   $envinfo              = "",
+  $testdataVersion      = "",
   ) {
 
   include "bugzilla"
diff --git a/org.eclipse.mylyn.bugzilla.releng/modules/bugzilla/templates/service.json.erb b/org.eclipse.mylyn.bugzilla.releng/modules/bugzilla/templates/service.json.erb
index e8abf3ae3..782077850 100644
--- a/org.eclipse.mylyn.bugzilla.releng/modules/bugzilla/templates/service.json.erb
+++ b/org.eclipse.mylyn.bugzilla.releng/modules/bugzilla/templates/service.json.erb
@@ -14,5 +14,6 @@
 <% if @branch               %><% if @propertyanz.to_i > 0 %>   ,<% else %>    <% end %><% @propertyanz = @propertyanz.to_i -%><% @propertyanz += 1 -%>"branch": "<%= @branch %>"<% end %>
 <% if @branchTag            %><% if @propertyanz.to_i > 0 %>   ,<% else %>    <% end %><% @propertyanz = @propertyanz.to_i -%><% @propertyanz += 1 -%>"branchTag": "<%= @branchTag %>"<% end %>
 <% if @rest_enabled         %><% if @propertyanz.to_i > 0 %>   ,<% else %>    <% end %><% @propertyanz = @propertyanz.to_i -%><% @propertyanz += 1 -%>"rest_enabled": "<%= @rest_enabled %>"<% end %>
+<% if @testdataVersion      %><% if @propertyanz.to_i > 0 %>   ,<% else %>    <% end %><% @propertyanz = @propertyanz.to_i -%><% @propertyanz += 1 -%>"testdataVersion": "<%= @testdataVersion %>"<% end %>
     }
 }
\ No newline at end of file