472116: update Bugzilla repository to 5.0 final

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

1 files changed, 93 insertions, 84 deletions

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 16263838d..3cb1b09de 100644
--- a/org.eclipse.mylyn.bugzilla.releng/modules/bugzilla/manifests/site.pp
+++ b/org.eclipse.mylyn.bugzilla.releng/modules/bugzilla/manifests/site.pp
@@ -12,13 +12,14 @@
 define bugzilla::site (
   $major,
   $minor,
+  $micro,
   $branch               = "${major}.${minor}",
   $bugz_dbname          =  regsubst($title, '([^.-]+)([.-]+)', '\1_', 'G'),
   $bugz_user            = $bugzilla::dbuser,
   $bugz_password        = $bugzilla::dbuserPassword,
   $www_url              = "$title",
-  $version              = "$title",
-  $branchTag            = "$title",
+  $bugzillaDir          = "$title",
+  $branchTag            = "",
   $custom_wf            = false,
   $custom_wf_and_status = false,
   $xmlrpc_enabled       = true,
@@ -27,7 +28,7 @@ define bugzilla::site (
   $envid                = "$title",
   $userOwner            = $bugzilla::userOwner,
   $userGroup            = $bugzilla::userGroup,
-  $envversion           = "${major}.${minor}",
+  $envversion           = "${major}.${minor}.${micro}",
   $envdefault           = false,
   $envdefault_rest      = false,
   $desciptorfile        = " ",
@@ -41,7 +42,15 @@ define bugzilla::site (
   include "bugzilla"
   $propertyanz = 0
   $confDir = "$base/conf.d"
-
+  if ($branchTag !="") {
+    $branchTagInternal = $branchTag
+  } else {
+    if ($micro !="") {
+      $branchTagInternal = "release-${major}.${minor}.${micro}"
+    } else {
+      $branchTagInternal = "release-${major}.${minor}"
+    }
+  }
   if $custom_wf {
     $envinfo1 = "Custom Workflow"
   } elsif $custom_wf_and_status {
@@ -80,104 +89,104 @@ define bugzilla::site (
   }
 
   if $branch == "master" {
-    if $branchTag == "HEAD" {
-      exec { "master master git fetch $version":
+    if $branchTagInternal == "HEAD" {
+      exec { "master master git fetch $bugzillaDir":
         command => "git fetch",
-        onlyif    => "/usr/bin/test -d $base/$version",
-        cwd     => "$base/$version",
+        onlyif    => "/usr/bin/test -d $base/$bugzillaDir",
+        cwd     => "$base/$bugzillaDir",
         user => "$userOwner",
         timeout => 300,
         logoutput => true,
         require   => Exec["prepare bugzilla"],
-        notify => Exec["end extract bugzilla $version"],
+        notify => Exec["end extract bugzilla $bugzillaDir"],
       }
-      exec { "master master git clone $version":
-        command => "git clone http://git.mozilla.org/bugzilla/bugzilla $base/$version",
+      exec { "master master git clone $bugzillaDir":
+        command => "git clone http://git.mozilla.org/bugzilla/bugzilla $base/$bugzillaDir",
         cwd     => "$base",
         user => "$userOwner",
         timeout => 300,
-        creates => "$base/$version",
+        creates => "$base/$bugzillaDir",
         require   => Exec["prepare bugzilla"],
-        notify => Exec["end extract bugzilla $version"],
+        notify => Exec["end extract bugzilla $bugzillaDir"],
       }
     } else {
-      exec { "master $branchTag git clone $version":
-        command => "git clone -b $branch http://git.mozilla.org/bugzilla/bugzilla $base/$version",
+      exec { "master $branchTagInternal git clone $bugzillaDir":
+        command => "git clone -b $branch http://git.mozilla.org/bugzilla/bugzilla $base/$bugzillaDir",
         cwd     => "$base",
         user => "$userOwner",
         timeout => 300,
-        creates => "$base/$version",
+        creates => "$base/$bugzillaDir",
         require   => Exec["prepare bugzilla"],
       }
-      exec { "master $branchTag git checkout $version":
-        command => "git checkout $branchTag",
-        cwd     => "$base/$version",
+      exec { "master $branchTagInternal git checkout $bugzillaDir":
+        command => "git checkout $branchTagInternal",
+        cwd     => "$base/$bugzillaDir",
         user => "$userOwner",
         logoutput => true,
         timeout => 300,
-        require   => Exec["master $branchTag git clone $version"],
-        notify => Exec["end extract bugzilla $version"],
+        require   => Exec["master $branchTagInternal git clone $bugzillaDir"],
+        notify => Exec["end extract bugzilla $bugzillaDir"],
       }
     }
   } else {
-    exec { "$branch $branchTag git fetch $version":
+    exec { "$branch $branchTagInternal git fetch $bugzillaDir":
       command => "git fetch",
-      onlyif    => "/usr/bin/test -d $base/$version",
-      cwd     => "$base/$version",
+      onlyif    => "/usr/bin/test -d $base/$bugzillaDir",
+      cwd     => "$base/$bugzillaDir",
       user => "$userOwner",
       timeout => 300,
       logoutput => true,
       require   => Exec["prepare bugzilla"],
-      notify => Exec["end extract bugzilla $version"],
+      notify => Exec["end extract bugzilla $bugzillaDir"],
     }
 
-    exec { "$branch $branchTag git clone $version":
-      command => "git clone -b $branch http://git.mozilla.org/bugzilla/bugzilla $base/$version",
+    exec { "$branch $branchTagInternal git clone $bugzillaDir":
+      command => "git clone -b $branch http://git.mozilla.org/bugzilla/bugzilla $base/$bugzillaDir",
       cwd     => "$base",
       user => "$userOwner",
       timeout => 300,
-      creates => "$base/$version",
+      creates => "$base/$bugzillaDir",
       require   => Exec["prepare bugzilla"],
     }
-    if $branchTag == "HEAD" {
-      exec { "$branch $branchTag dummy git checkout $version":
-        command => "echo '$branch $branchTag dummy git checkout $version'",
+    if $branchTagInternal == "HEAD" {
+      exec { "$branch $branchTagInternal dummy git checkout $bugzillaDir":
+        command => "echo '$branch $branchTagInternal dummy git checkout $bugzillaDir'",
         logoutput => true,
-        require   => Exec["$branch $branchTag git clone $version"],
-        notify => Exec["end extract bugzilla $version"],
+        require   => Exec["$branch $branchTagInternal git clone $bugzillaDir"],
+        notify => Exec["end extract bugzilla $bugzillaDir"],
       }
     } else {
-      exec { "$branch $branchTag git checkout $version":
-        command => "git checkout $branchTag",
-        cwd     => "$base/$version",
+      exec { "$branch $branchTagInternal git checkout $bugzillaDir":
+        command => "git checkout $branchTagInternal",
+        cwd     => "$base/$bugzillaDir",
         user => "$userOwner",
         timeout => 300,
-        require   => Exec["$branch $branchTag git clone $version"],
-        notify => Exec["end extract bugzilla $version"],
+        require   => Exec["$branch $branchTagInternal git clone $bugzillaDir"],
+        notify => Exec["end extract bugzilla $bugzillaDir"],
       }
     }
   }
 
-  exec { "end extract bugzilla $version":
-      command => "echo 'end extract bugzilla $version $branch $branchTag'",
+  exec { "end extract bugzilla $bugzillaDir":
+      command => "echo 'end extract bugzilla $bugzillaDir $branch $branchTagInternal'",
       logoutput => true,
     }
 
-  file { "$base/$version/installPerlModules.sh":
+  file { "$base/$bugzillaDir/installPerlModules.sh":
     content => template('bugzilla/installPerlModules.sh.erb'),
     owner   => "$userOwner",
     group   => "$userGroup",
     mode    => 0755,
-    require => Exec["end extract bugzilla $version"],
+    require => Exec["end extract bugzilla $bugzillaDir"],
   }
 
-  exec { "post extract bugzilla $version":
-    command => "$base/$version/installPerlModules.sh  >$base/$version/CGI.out",
-    cwd     => "$base/$version",
-    creates => "$base/$version/CGI.out",
+  exec { "post extract bugzilla $bugzillaDir":
+    command => "$base/$bugzillaDir/installPerlModules.sh  >$base/$bugzillaDir/CGI.out",
+    cwd     => "$base/$bugzillaDir",
+    creates => "$base/$bugzillaDir/CGI.out",
     user => "$userOwner",
-    timeout => 3000,
-    require   => File["$base/$version/installPerlModules.sh"]
+    timeout => 300,
+    require   => File["$base/$bugzillaDir/installPerlModules.sh"]
   }
 
   exec { "mysql-grant-${bugz_dbname}-${bugzilla::dbuser}":
@@ -185,45 +194,45 @@ define bugzilla::site (
     "/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",
-    require   => Exec["post extract bugzilla $version"]
+    require   => Exec["post extract bugzilla $bugzillaDir"]
   }
 
   if $clearMode == "clear" {
-    exec { "mysql-dropdb-$version":
+    exec { "mysql-dropdb-$bugzillaDir":
       onlyif    => "/usr/bin/mysql --user=root '${bugz_dbname}'",
       command   => "/usr/bin/mysqladmin -v --user=root --force drop '${bugz_dbname}'",
       require   => Exec["mysql-grant-${bugz_dbname}-${bugzilla::dbuser}"]
     }
 
-    exec { "mysql-createdb-$version":
+    exec { "mysql-createdb-$bugzillaDir":
       unless    => "/usr/bin/mysql --user=root '${bugz_dbname}'",
       command   => "/usr/bin/mysqladmin -v --user=root --force create '${bugz_dbname}'",
-      require   => Exec["mysql-dropdb-$version"]
+      require   => Exec["mysql-dropdb-$bugzillaDir"]
     }
   } else {
-    exec { "mysql-createdb-$version":
+    exec { "mysql-createdb-$bugzillaDir":
       unless    => "/usr/bin/mysql --user=root '${bugz_dbname}'",
       command   => "/usr/bin/mysqladmin -v --user=root --force create '${bugz_dbname}'",
       require   => Exec["mysql-grant-${bugz_dbname}-${bugzilla::dbuser}"]
     }
   }
 
-  file { "$base/$version/callchecksetup.pl":
+  file { "$base/$bugzillaDir/callchecksetup.pl":
     content => template('bugzilla/callchecksetup.pl.erb'),
     owner   => "$userOwner",
     group   => "$userGroup",
     mode    => 0755,
-    require => Exec["post extract bugzilla $version"],
+    require => Exec["post extract bugzilla $bugzillaDir"],
   }
 
-  file { "$base/$version/answers":
+  file { "$base/$bugzillaDir/answers":
     content => template('bugzilla/answers.erb'),
     owner   => "$userOwner",
     group   => "$userGroup",
-    require => Exec["post extract bugzilla $version"],
+    require => Exec["post extract bugzilla $bugzillaDir"],
   }
 
-  file { "$base/$version/extensions/Mylyn":
+  file { "$base/$bugzillaDir/extensions/Mylyn":
     ensure  => directory, # so make this a directory
     recurse => true, # enable recursive directory management
     purge   => true, # purge all unmanaged junk
@@ -231,70 +240,70 @@ define bugzilla::site (
     owner   => "$userOwner",
     group   => "$userGroup",
     source  => "puppet:///modules/bugzilla/extensions/Mylyn",
-    require => Exec["post extract bugzilla $version"],
+    require => Exec["post extract bugzilla $bugzillaDir"],
   }
 
-  file { "$base/$version/extensions/Mylyn/Extension.pm":
+  file { "$base/$bugzillaDir/extensions/Mylyn/Extension.pm":
     content => template('bugzilla/Extension.pm.erb'),
-    require => File["$base/$version/extensions/Mylyn"],
+    require => File["$base/$bugzillaDir/extensions/Mylyn"],
     owner   => "$userOwner",
     group   => "$userGroup",
     mode    => 0644,
   }
 
-  exec { "init bugzilla_checksetup $version":
-    command => "$base/$version/callchecksetup.pl",
-    cwd     => "$base/$version",
-    creates => "$base/$version/localconfig",
+  exec { "init bugzilla_checksetup $bugzillaDir":
+    command => "$base/$bugzillaDir/callchecksetup.pl",
+    cwd     => "$base/$bugzillaDir",
+    creates => "$base/$bugzillaDir/localconfig",
     user => "$userOwner",
     logoutput => true,
     require => [
-      Exec["mysql-createdb-$version"],
-      File["$base/$version/answers"],
-      File["$base/$version/callchecksetup.pl"],
-      File["$base/$version/extensions/Mylyn/Extension.pm"]]
+      Exec["mysql-createdb-$bugzillaDir"],
+      File["$base/$bugzillaDir/answers"],
+      File["$base/$bugzillaDir/callchecksetup.pl"],
+      File["$base/$bugzillaDir/extensions/Mylyn/Extension.pm"]]
   }
 
-  exec { "update bugzilla_checksetup $version":
-    command   => "$base/$version/callchecksetup.pl",
-    cwd       => "$base/$version",
+  exec { "update bugzilla_checksetup $bugzillaDir":
+    command   => "$base/$bugzillaDir/callchecksetup.pl",
+    cwd       => "$base/$bugzillaDir",
     logoutput => true,
     user => "$userOwner",
     require   => [
-      Exec["mysql-createdb-$version"],
-      Exec["init bugzilla_checksetup $version"],
-      File["$base/$version/answers"],
-      File["$base/$version/extensions/Mylyn/Extension.pm"],
+      Exec["mysql-createdb-$bugzillaDir"],
+      Exec["init bugzilla_checksetup $bugzillaDir"],
+      File["$base/$bugzillaDir/answers"],
+      File["$base/$bugzillaDir/extensions/Mylyn/Extension.pm"],
       ]
   }
 
   if !$xmlrpc_enabled {
-    file { "$base/$version/xmlrpc.cgi":
+    file { "$base/$bugzillaDir/xmlrpc.cgi":
       content => template('bugzilla/xmlrpc.cgi.erb'),
       owner   => "$userOwner",
       group   => "$userGroup",
       mode    => 755,
-      require => Exec["update bugzilla_checksetup $version"],
+      require => Exec["update bugzilla_checksetup $bugzillaDir"],
     }
   }
 
-  file { "$base/$version/service.json":
+  file { "$base/$bugzillaDir/service.json":
     content => template('bugzilla/service.json.erb'),
     owner   => "$userOwner",
     group   => "$userGroup",
     mode    => 644,
-    require =>  Exec["update bugzilla_checksetup $version"],
+    require =>  Exec["update bugzilla_checksetup $bugzillaDir"],
   }
 
-  file { "$confDir/$version.conf":
+  file { "$confDir/$bugzillaDir.conf":
     content => template('bugzilla/apache2.conf.erb'),
-    require => [Package["apache2"], Exec["update bugzilla_checksetup $version"]],
+    require => [Package["apache2"], Exec["update bugzilla_checksetup $bugzillaDir"]],
     notify  => Service["apache2"],
   }
 
-  exec { "add $version to /etc/apache2/conf-enabled/bugzilla.conf":
+  exec { "add $bugzillaDir to /etc/apache2/conf-enabled/bugzilla.conf":
     command => "echo 'Include $base/conf.d/[^.#]*\n' >> /etc/apache2/conf-enabled/bugzilla.conf",
-    require => File["$confDir/$version.conf"],
+    require => File["$confDir/$bugzillaDir.conf"],
     notify  => Service["apache2"],
     onlyif  => "grep -qe '^Include $base/conf.d' /etc/apache2/conf-enabled/bugzilla.conf; test $? != 0"
   }