Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrank Becker2016-05-27 19:07:14 +0000
committerGerrit Code Review @ Eclipse.org2016-06-15 18:41:44 +0000
commit7b6c8404b6eaa24858337cf04ba4d05aa0f4cb3b (patch)
tree4def5e386f47c812562dc167eda9e8a8741afbdd /org.eclipse.mylyn.bugzilla.releng/modules
parent58364eba5fc175eb77d98c96f30976bd60b22b39 (diff)
downloadorg.eclipse.mylyn.tasks-7b6c8404b6eaa24858337cf04ba4d05aa0f4cb3b.tar.gz
org.eclipse.mylyn.tasks-7b6c8404b6eaa24858337cf04ba4d05aa0f4cb3b.tar.xz
org.eclipse.mylyn.tasks-7b6c8404b6eaa24858337cf04ba4d05aa0f4cb3b.zip
494233: Release of Bugzilla 5.0.3, 4.4.12, and 5.1.1
Change-Id: Ib475e0653404b403db54cb27e391945ca7618caf Task-Url: https://bugs.eclipse.org/bugs/show_bug.cgi?id=494233
Diffstat (limited to 'org.eclipse.mylyn.bugzilla.releng/modules')
-rw-r--r--org.eclipse.mylyn.bugzilla.releng/modules/bugzilla/manifests/defaultsites.pp34
-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.pp6
-rw-r--r--org.eclipse.mylyn.bugzilla.releng/modules/bugzilla/templates/Extension.pm.erb7
-rw-r--r--org.eclipse.mylyn.bugzilla.releng/modules/bugzilla/templates/answers.erb2
5 files changed, 31 insertions, 21 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 770df2a54..85c3db523 100644
--- a/org.eclipse.mylyn.bugzilla.releng/modules/bugzilla/manifests/defaultsites.pp
+++ b/org.eclipse.mylyn.bugzilla.releng/modules/bugzilla/manifests/defaultsites.pp
@@ -35,47 +35,47 @@ define bugzilla::defaultsites($base = $bugzilla::bugzillaBase, $userOwner = $bug
micro => "16",
}
- bugzilla::site { "bugzilla-4.4.11-bugaliases":
+ bugzilla::site { "bugzilla-4.4.12-bugaliases":
major => "4",
minor => "4",
- micro => "11",
+ micro => "12",
usebugaliases => true,
}
- bugzilla::site { "bugzilla-4.4.11":
+ bugzilla::site { "bugzilla-4.4.12":
major => "4",
minor => "4",
- micro => "11",
+ micro => "12",
envdefault => true,
}
- bugzilla::site { "bugzilla-4.4.11-custom-wf":
+ bugzilla::site { "bugzilla-4.4.12-custom-wf":
major => "4",
minor => "4",
- micro => "11",
+ micro => "12",
custom_wf => true,
}
- bugzilla::site { "bugzilla-4.4.11-custom-wf-and-status":
+ bugzilla::site { "bugzilla-4.4.12-custom-wf-and-status":
major => "4",
minor => "4",
- micro => "11",
+ micro => "12",
custom_wf_and_status => true,
}
- bugzilla::site { "bugzilla-5.0.2":
+ bugzilla::site { "bugzilla-5.0.3":
major => "5",
minor => "0",
- micro => "2",
+ micro => "3",
}
-
+
bugzilla::site { "bugzilla-master":
major => "5",
minor => "1",
- micro => "",
+ micro => "1",
branch => "master",
branchTag => "HEAD",
- envversion => "5.1",
+ envversion => "5.1.1+",
envinfo => "Master",
}
@@ -83,10 +83,10 @@ define bugzilla::defaultsites($base = $bugzilla::bugzillaBase, $userOwner = $bug
* REST sites
*******************************************************************************/
- bugzilla::site { "bugzilla-rest-5.0.2":
+ bugzilla::site { "bugzilla-rest-5.0.3":
major => "5",
minor => "0",
- micro => "2",
+ micro => "3",
envtype => "bugzillaREST",
rest_enabled => true,
envdefault_rest => true,
@@ -97,10 +97,10 @@ define bugzilla::defaultsites($base = $bugzilla::bugzillaBase, $userOwner = $bug
bugzilla::site { "bugzilla-rest-master":
major => "5",
minor => "1",
- micro => "",
+ micro => "1",
branch => "master",
branchTag => "HEAD",
- envversion => "5.1",
+ envversion => "5.1.1+",
envinfo => "Master",
envtype => "bugzillaREST",
rest_enabled => true,
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 e4b96c845..7bcce82bb 100644
--- a/org.eclipse.mylyn.bugzilla.releng/modules/bugzilla/manifests/init.pp
+++ b/org.eclipse.mylyn.bugzilla.releng/modules/bugzilla/manifests/init.pp
@@ -77,6 +77,7 @@ class bugzilla {
"php5",
"phpmyadmin",
"puppet",
+ "cpanminus"
]
@@ -195,7 +196,7 @@ class bugzilla {
}
exec { "prepare bugzilla":
- command => "echo Bugzilla pre-requisites are installed",
+ command => "cpanm CGI; cpanm DBI; cpanm DateTime::TimeZone; cpanm Email::Sender;echo Bugzilla pre-requisites are installed",
require => [Exec["mysql create user ${dbuser}"],Exec["create $confDir"]],
}
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 1fde3fa1d..5b8c9f667 100644
--- a/org.eclipse.mylyn.bugzilla.releng/modules/bugzilla/manifests/site.pp
+++ b/org.eclipse.mylyn.bugzilla.releng/modules/bugzilla/manifests/site.pp
@@ -261,7 +261,7 @@ define bugzilla::site (
}
exec { "init bugzilla_checksetup $bugzillaDir":
- command => "$base/$bugzillaDir/callchecksetup.pl",
+ command => "$base/$bugzillaDir/checksetup.pl $base/$bugzillaDir/answers || exit 0",
cwd => "$base/$bugzillaDir",
creates => "$base/$bugzillaDir/localconfig",
user => "$userOwner",
@@ -273,11 +273,11 @@ define bugzilla::site (
File["$base/$bugzillaDir/extensions/Mylyn/Extension.pm"]]
}
+
exec { "update bugzilla_checksetup $bugzillaDir":
- command => "$base/$bugzillaDir/callchecksetup.pl",
+ command => "$base/$bugzillaDir/checksetup.pl $base/$bugzillaDir/answers || exit 0",
cwd => "$base/$bugzillaDir",
logoutput => true,
- user => "$userOwner",
require => [
Exec["mysql-createdb-$bugzillaDir"],
Exec["init bugzilla_checksetup $bugzillaDir"],
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 c9ff65bdc..b61d4c014 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
@@ -62,6 +62,10 @@ sub install_before_final_checks {
# create tests@mylyn.eclipse.org
# add this user to group bz_canusewhineatothers
my $testu = Bugzilla::User->create({ login_name => 'tests@mylyn.eclipse.org',
+<% if @envversionInternal >= "5.1" %>
+
+ email => 'tests@mylyn.eclipse.org',
+<% end %>
realname => 'Mylyn Test',
cryptpassword => 'mylyntest' });
my $private_group = new Bugzilla::Group({name => 'bz_canusewhineatothers'});
@@ -72,6 +76,9 @@ sub install_before_final_checks {
# create guest@mylyn.eclipse.org
Bugzilla::User->create({ login_name => 'guest@mylyn.eclipse.org',
+<% if @envversionInternal >= "5.1" %>
+ email => 'guest@mylyn.eclipse.org',
+<% end %>
realname => 'Mylyn guest',
cryptpassword => 'mylyntest' });
}
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 eca2ac51a..fcaefa243 100644
--- a/org.eclipse.mylyn.bugzilla.releng/modules/bugzilla/templates/answers.erb
+++ b/org.eclipse.mylyn.bugzilla.releng/modules/bugzilla/templates/answers.erb
@@ -7,6 +7,7 @@ $answer{'db_user'} = '<%= @bugz_user %>';
$answer{'db_pass'} = '<%= @bugz_password %>';
$answer{'urlbase'} = '';
$answer{'ADMIN_OK'} = 'Y';
+$answer{'ADMIN_LOGIN'} = 'admin@mylyn.eclipse.org';
$answer{'ADMIN_EMAIL'} = 'admin@mylyn.eclipse.org';
$answer{'ADMIN_PASSWORD'} = 'main4Afo';
$answer{'ADMIN_REALNAME'} = 'Mylyn Admin';
@@ -16,6 +17,7 @@ $answer{'mail_delivery_method'} = 'None';
$answer{'useqacontact'} = '1';
$answer{'usestatuswhiteboard'} = '1';
$answer{'maintainer'} = 'admin@mylyn.eclipse.org';
+$answer{'use_email_as_login'} = '1';
$answer{'insidergroup'} = 'bz_canusewhineatothers';
<% if @custom_wf_and_status %>$answer{'duplicate_or_move_bug_status'} = 'VERIFIED';<% end %>

Back to the top