Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrank Becker2013-11-14 14:58:39 -0500
committerFrank Becker2013-11-14 23:11:21 -0500
commitb7b015cdebf9f4171b928abd0840690e7f2d627a (patch)
treefc77273612b7cca355e2455c20a017f27c063a5c
parent692f3d53eb4ce18ea8280008b83f9960f5b29251 (diff)
downloadorg.eclipse.mylyn.tasks-b7b015cdebf9f4171b928abd0840690e7f2d627a.tar.gz
org.eclipse.mylyn.tasks-b7b015cdebf9f4171b928abd0840690e7f2d627a.tar.xz
org.eclipse.mylyn.tasks-b7b015cdebf9f4171b928abd0840690e7f2d627a.zip
414360: create new testinstance for the Bugzilla 5.0 REST API
Change-Id: I375f076925d1b45b51dfdb4f4d7b6700c85efd7f Task-Url: https://bugs.eclipse.org/bugs/show_bug.cgi?id=414360
-rw-r--r--org.eclipse.mylyn.bugzilla.releng/modules/bugzilla/manifests/defaultsites.pp9
-rw-r--r--org.eclipse.mylyn.bugzilla.releng/modules/bugzilla/manifests/init.pp3
-rw-r--r--org.eclipse.mylyn.bugzilla.releng/modules/bugzilla/manifests/site.pp20
-rw-r--r--org.eclipse.mylyn.bugzilla.releng/modules/bugzilla/templates/Extension.pm.erb1
-rw-r--r--org.eclipse.mylyn.bugzilla.releng/modules/bugzilla/templates/answers.erb2
-rw-r--r--org.eclipse.mylyn.bugzilla.releng/modules/bugzilla/templates/service.json.erb3
6 files changed, 33 insertions, 5 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 071a8c17d..53b3d4e7d 100644
--- a/org.eclipse.mylyn.bugzilla.releng/modules/bugzilla/manifests/defaultsites.pp
+++ b/org.eclipse.mylyn.bugzilla.releng/modules/bugzilla/manifests/defaultsites.pp
@@ -81,4 +81,13 @@ define bugzilla::defaultsites($base = $bugzilla::bugzillaBase, $userOwner = $bug
branchTag => "trunk",
}
+bugzilla::site { "bugzilla-rest-trunk":
+ major => "4",
+ minor => "5",
+ branch => "trunk",
+ branchTag => "trunk",
+ rest_enabled => true,
+ envversion => "4.5.1+",
+ }
+
} \ No newline at end of file
diff --git a/org.eclipse.mylyn.bugzilla.releng/modules/bugzilla/manifests/init.pp b/org.eclipse.mylyn.bugzilla.releng/modules/bugzilla/manifests/init.pp
index 45a5361ca..ff437f763 100644
--- a/org.eclipse.mylyn.bugzilla.releng/modules/bugzilla/manifests/init.pp
+++ b/org.eclipse.mylyn.bugzilla.releng/modules/bugzilla/manifests/init.pp
@@ -48,7 +48,8 @@ class bugzilla {
"libtest-taint-perl",
"liburi-perl",
"libsoap-lite-perl",
- "libtemplate-perl",]
+ "libtemplate-perl",
+ "patchutils",]
package { $requirements:
ensure => "installed",
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 fc379058f..d2523e288 100644
--- a/org.eclipse.mylyn.bugzilla.releng/modules/bugzilla/manifests/site.pp
+++ b/org.eclipse.mylyn.bugzilla.releng/modules/bugzilla/manifests/site.pp
@@ -32,6 +32,7 @@ define bugzilla::site (
$desciptorfile = " ",
$usebugaliases = false,
$clearMode = $bugzilla::clearMode,
+ $rest_enabled = false,
) {
include "bugzilla"
@@ -51,13 +52,26 @@ define bugzilla::site (
}
if $envinfo1 != "" {
if !$xmlrpc_enabled {
- $envinfo = "$envinfo1, XML-RPC disabled"
+ $envinfo2 = "$envinfo1, XML-RPC disabled"
} else {
- $envinfo = "$envinfo1"
+ $envinfo2 = "$envinfo1"
}
} else {
if !$xmlrpc_enabled {
- $envinfo = "XML-RPC disabled"
+ $envinfo2 = "XML-RPC disabled"
+ } else {
+ $envinfo2 = ""
+ }
+ }
+ if $envinfo2 != "" {
+ if $rest_enabled {
+ $envinfo = "$envinfo2, REST enabled"
+ } else {
+ $envinfo = "$envinfo2"
+ }
+ } else {
+ if $rest_enabled {
+ $envinfo = "REST enabled"
} else {
$envinfo = ""
}
diff --git a/org.eclipse.mylyn.bugzilla.releng/modules/bugzilla/templates/Extension.pm.erb b/org.eclipse.mylyn.bugzilla.releng/modules/bugzilla/templates/Extension.pm.erb
index 7b178150d..162f90380 100644
--- a/org.eclipse.mylyn.bugzilla.releng/modules/bugzilla/templates/Extension.pm.erb
+++ b/org.eclipse.mylyn.bugzilla.releng/modules/bugzilla/templates/Extension.pm.erb
@@ -138,6 +138,7 @@ sub install_before_final_checks {
version => Bugzilla::Version::DEFAULT_VERSION,
classification => 'Unclassified',
defaultmilestone => DEFAULT_MILESTONE,
+ allows_unconfirmed => 0,
});
Bugzilla::Component->create({ %{ ({
name => 'ManualC1',
diff --git a/org.eclipse.mylyn.bugzilla.releng/modules/bugzilla/templates/answers.erb b/org.eclipse.mylyn.bugzilla.releng/modules/bugzilla/templates/answers.erb
index bc75ee3d5..81e8bb325 100644
--- a/org.eclipse.mylyn.bugzilla.releng/modules/bugzilla/templates/answers.erb
+++ b/org.eclipse.mylyn.bugzilla.releng/modules/bugzilla/templates/answers.erb
@@ -13,6 +13,8 @@ $answer{'ADMIN_REALNAME'} = 'Mylyn Admin';
$answer{'SMTP_SERVER'} = '';
$answer{'usetargetmilestone'} = '1';
$answer{'mail_delivery_method'} = 'None';
+$answer{'useqacontact'} = '1';
+$answer{'usestatuswhiteboard'} = '1';
$answer{'insidergroup'} = 'bz_canusewhineatothers';
<% if @custom_wf_and_status %>$answer{'duplicate_or_move_bug_status'} = 'CLOSED';<% end %>
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 920c5a55d..e02e5ec6e 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
@@ -10,5 +10,6 @@
<% if !@xmlrpc_enabled %><% if propertyanz.to_i > 0 %> ,<% else %> <% end %><% propertyanz = propertyanz.to_i -%><% propertyanz += 1 -%>"xmlrpc_enabled": "<%= xmlrpc_enabled %>"<% end %>
<% if @desciptorfile > " " %><% if propertyanz.to_i > 0 %> ,<% else %> <% end %><% propertyanz = propertyanz.to_i -%><% propertyanz += 1 -%>"desciptorfile": "<%= desciptorfile %>"<% end %>
<% if @usebugaliases %><% if propertyanz.to_i > 0 %> ,<% else %> <% end %><% propertyanz = propertyanz.to_i -%><% propertyanz += 1 -%>"usebugaliases": "<%= usebugaliases %>"<% end %>
- }
+<% if @rest_enabled %><% if propertyanz.to_i > 0 %> ,<% else %> <% end %><% propertyanz = propertyanz.to_i -%><% propertyanz += 1 -%>"rest_enabled": "<%= rest_enabled %>"<% end %>
+ }
}

Back to the top