450874: revert bugzilla 4.5.6+ to 4.5.5 because of lucid problem on

mylyn.org

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

4 files changed, 35 insertions, 34 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 4d8304f22..a8a6f331c 100644
--- a/org.eclipse.mylyn.bugzilla.releng/modules/bugzilla/manifests/defaultsites.pp
+++ b/org.eclipse.mylyn.bugzilla.releng/modules/bugzilla/manifests/defaultsites.pp
@@ -81,19 +81,19 @@ define bugzilla::defaultsites($base = $bugzilla::bugzillaBase, $userOwner = $bug
     major       => "5",
     minor       => "0",
     branch      => "5.0",
-    branchTag   => "5.0",
-    envversion   => "4.5.6+",
+    branchTag   => "bugzilla-4.5.5",
+    envversion   => "4.5.5",
   }
 
   bugzilla::site { "bugzilla-5.0-rest":
     major       => "5",
     minor       => "0",
     branch      => "5.0",
-    branchTag   => "5.0",
+    branchTag   => "bugzilla-4.5.5",
     envtype      => "bugzillaREST",
     rest_enabled => true,
     envdefault_rest => true,
-    envversion   => "4.5.6+",
+    envversion   => "4.5.5",
   }
 
 }
\ 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 a9cdac338..f3f82ca40 100644
--- a/org.eclipse.mylyn.bugzilla.releng/modules/bugzilla/manifests/init.pp
+++ b/org.eclipse.mylyn.bugzilla.releng/modules/bugzilla/manifests/init.pp
@@ -115,7 +115,7 @@ class bugzilla {
     target => "/etc/apache2/sites-available/default-ssl",
   }
 
- if $envhost != "mylyn.org"{ 
+ if $envhost != "mylyn.org"{
     file { "$bugzillaBase/servicephpmyadmin.json":
       source  => "puppet:///modules/bugzilla/servicephpmyadmin.json",		
       owner   => "$userOwner",
@@ -130,7 +130,7 @@ class bugzilla {
     mode => 755,		
     require => Package[$requirements],
   }
-  
+
   $_exists =inline_template("<%= File.exists?('/etc/bugzilla_clear_mode') %>")
   if $_exists == "true"  {
     $clearMode            = regsubst(file("/etc/bugzilla_clear_mode"), '\n', '')
@@ -138,7 +138,7 @@ class bugzilla {
     $clearMode            = "noclear"
     exec { "create clearMode":
       command => "echo \"noclear\" >/etc/bugzilla_clear_mode",
-      creates => '/etc/bugzilla_clear_mode', 
+      creates => '/etc/bugzilla_clear_mode',
     }
   }
 
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 32269a64a..0a2d1d6e0 100644
--- a/org.eclipse.mylyn.bugzilla.releng/modules/bugzilla/manifests/site.pp
+++ b/org.eclipse.mylyn.bugzilla.releng/modules/bugzilla/manifests/site.pp
@@ -42,13 +42,13 @@ define bugzilla::site (
   $confDir = "$base/conf.d"
 
   if $custom_wf {
-    $envinfo1 = "Custom Workflow"  
+    $envinfo1 = "Custom Workflow"
   } elsif $custom_wf_and_status {
-    $envinfo1 = "Custom Workflow and Status"  
+    $envinfo1 = "Custom Workflow and Status"
   } elsif $usebugaliases {
-    $envinfo1 = "Use Bugaliases"  
+    $envinfo1 = "Use Bugaliases"
   } else {
-    $envinfo1 = ""  
+    $envinfo1 = ""
   }
   if $envinfo1 != "" {
     if !$xmlrpc_enabled {
@@ -90,7 +90,7 @@ define bugzilla::site (
   } else {
     $VersionCreateName = "value"
   }
- 
+
   if $branch == "master" {
     if $branchTag == "HEAD" {
       exec { "master master git fetch $version":
@@ -102,7 +102,7 @@ define bugzilla::site (
         logoutput => true,
         require   => Exec["prepare bugzilla"],
         notify => Exec["end extract bugzilla $version"],
-      }  
+      }
       exec { "master master git clone $version":
         command => "git clone http://git.mozilla.org/bugzilla/bugzilla $base/$version",
         cwd     => "$base",
@@ -141,7 +141,8 @@ define bugzilla::site (
       logoutput => true,
       require   => Exec["prepare bugzilla"],
       notify => Exec["end extract bugzilla $version"],
-    }  
+    }
+
     exec { "$branch $branchTag git clone $version":
       command => "git clone http://git.mozilla.org/bugzilla/bugzilla $base/$version",
       cwd     => "$base",
@@ -168,12 +169,12 @@ define bugzilla::site (
       }
     }
   }
-  
+
   exec { "end extract bugzilla $version":
       command => "echo 'end extract bugzilla $version $branch $branchTag'",
       logoutput => true,
     }
- 
+
   file { "$base/$version/installPerlModules.sh":
     content => template('bugzilla/installPerlModules.sh.erb'),
     owner   => "$userOwner",
@@ -189,10 +190,10 @@ define bugzilla::site (
     user => "$userOwner",
     timeout => 3000,
     require   => File["$base/$version/installPerlModules.sh"]
-  }  
-  
+  }
+
   exec { "mysql-grant-${bugz_dbname}-${bugzilla::dbuser}":
-    unless    => 
+    unless    =>
     "/usr/bin/mysql --user=root --batch -e \"SELECT user FROM db WHERE Host='localhost' and Db='${bugz_dbname}' and User='${bugzilla::dbuser}'\" mysql | /bin/grep '${bugzilla::dbuser}'",
     command   => "/usr/bin/mysql --verbose --user=root -e \"GRANT ALL ON ${bugz_dbname}.* TO '${bugzilla::dbuser}'@localhost\" \
         		; /usr/bin/mysqladmin --verbose --user=root flush-privileges",
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 162d7bde9..ec556a22d 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
@@ -1,18 +1,18 @@
-{ 
-  "type": "<%= envtype %>",
-  "url": "/<%= envid %>",
-  "version": "<%= envversion %>",
-  "info": "<%= envinfo_intern %>",
+{
+  "type": "<%= @envtype %>",
+  "url": "/<%= @envid %>",
+  "version": "<%= @envversion %>",
+  "info": "<%= @envinfo_intern %>",
   "properties":{
-<% if @envdefault           %><% if propertyanz.to_i > 0 %>   ,<% else %>    <% end %><% propertyanz = propertyanz.to_i -%><% propertyanz += 1 -%>"default": "1"<% end %>
-<% if @envdefault_rest      %><% 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 %>
-<% if @custom_wf_and_status %><% if propertyanz.to_i > 0 %>   ,<% else %>    <% end %><% propertyanz = propertyanz.to_i -%><% propertyanz += 1 -%>"custom_wf_and_status": "<%= custom_wf_and_status %>"<% end %>
-<% 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 @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 @envdefault           %><% if @propertyanz.to_i > 0 %>   ,<% else %>    <% end %><% @propertyanz = @propertyanz.to_i -%><% @propertyanz += 1 -%>"default": "1"<% end %>
+<% if @envdefault_rest      %><% 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 %>
+<% if @custom_wf_and_status %><% if @propertyanz.to_i > 0 %>   ,<% else %>    <% end %><% @propertyanz = @propertyanz.to_i -%><% @propertyanz += 1 -%>"custom_wf_and_status": "<%= custom_wf_and_status %>"<% end %>
+<% 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 @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 %>
     }
 }
\ No newline at end of file