diff options
Diffstat (limited to 'org.eclipse.mylyn.bugzilla.releng/modules')
3 files changed, 40 insertions, 8 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 9e26a006d..86c8df56b 100644 --- a/org.eclipse.mylyn.bugzilla.releng/modules/bugzilla/manifests/defaultsites.pp +++ b/org.eclipse.mylyn.bugzilla.releng/modules/bugzilla/manifests/defaultsites.pp @@ -74,12 +74,37 @@ define bugzilla::defaultsites($base = $bugzilla::bugzillaBase, $userOwner = $bug minor => "4", } + bugzilla::site { "bugzilla-4.4.2": + major => "4", + minor => "4", + } + +bugzilla::site { "bugzilla-4.5.2": + major => "4", + minor => "5", + branch => "trunk", + branchTag => "bugzilla-4.5.2", + envdefault_rest => true, + envversion => "4.5.2", + } + +bugzilla::site { "bugzilla-rest-4.5.2": + major => "4", + minor => "5", + branch => "trunk", + branchTag => "bugzilla-4.5.2", + envdefault_rest => true, + rest_enabled => true, + envversion => "4.5.2", + envinfo => "4.5.2, REST enabled" + } + bugzilla::site { "bugzilla-trunk": major => "4", minor => "5", branch => "trunk", branchTag => "trunk", - envversion => "4.5.1+", + envversion => "4.5.2+", } bugzilla::site { "bugzilla-rest-trunk": @@ -87,9 +112,10 @@ bugzilla::site { "bugzilla-rest-trunk": minor => "5", branch => "trunk", branchTag => "trunk", - envversion => "4.5.1+", + envversion => "4.5.2+", envdefault_rest => true, rest_enabled => true, } + }
\ 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 64fdf3e05..736f7110d 100644 --- a/org.eclipse.mylyn.bugzilla.releng/modules/bugzilla/manifests/site.pp +++ b/org.eclipse.mylyn.bugzilla.releng/modules/bugzilla/manifests/site.pp @@ -34,6 +34,7 @@ define bugzilla::site ( $usebugaliases = false, $clearMode = $bugzilla::clearMode, $rest_enabled = false, + $envinfo = "", ) { include "bugzilla" @@ -66,17 +67,22 @@ define bugzilla::site ( } if $envinfo2 != "" { if $rest_enabled { - $envinfo = "$envinfo2, REST enabled" + $envinfo3 = "$envinfo2, REST enabled" } else { - $envinfo = "$envinfo2" + $envinfo3 = "$envinfo2" } } else { if $rest_enabled { - $envinfo = "REST enabled" + $envinfo3 = "REST enabled" } else { - $envinfo = "" + $envinfo3 = "" } } + if $envinfo != "" { + $envinfo_intern = $envinfo + } else { + $envinfo_intern = $envinfo3 + } if $major == "3" { if $minor == "6" { $VersionCreateName = "name" 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 627d943ff..bb46d7512 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 @@ -2,7 +2,7 @@ "type": "<%= envtype %>", "url": "/<%= envid %>", "version": "<%= envversion %>", - "info": "<%= envinfo %>", + "info": "<%= envinfo_intern %>", "properties":{ <% if @envdefault %><% if propertyanz.to_i > 0 %> ,<% else %> <% end %><% propertyanz = propertyanz.to_i -%><% propertyanz += 1 -%>"default": "1"<% end %> <% if @custom_wf %><% if propertyanz.to_i > 0 %> ,<% else %> <% end %><% propertyanz = propertyanz.to_i -%><% propertyanz += 1 -%>"custom_wf": "<%= custom_wf %>"<% end %> @@ -18,7 +18,7 @@ "type": "bugzillaREST", "url": "/<%= envid %>", "version": "<%= envversion %>", - "info": "<%= envinfo %>", + "info": "<%= envinfo_intern %>", <% propertyanz = 0 -%> "properties":{ <% if @envdefault_rest %><% if propertyanz.to_i > 0 %> ,<% else %> <% end %><% propertyanz = propertyanz.to_i -%><% propertyanz += 1 -%>"default": "1"<% end %> |