diff options
| author | Sascha Vogt | 2014-07-17 08:36:27 +0000 |
|---|---|---|
| committer | Sam Davis | 2014-08-08 18:18:14 +0000 |
| commit | 26d0714a9de4547710832167cd8bf79727de4417 (patch) | |
| tree | c61caaeb538af0f3d8068852d75db3c4bf8cb8dd | |
| parent | c0e11f3f3fceedd5e917203560f9ddd486757609 (diff) | |
| download | org.eclipse.mylyn.reviews-26d0714a9de4547710832167cd8bf79727de4417.tar.gz org.eclipse.mylyn.reviews-26d0714a9de4547710832167cd8bf79727de4417.tar.xz org.eclipse.mylyn.reviews-26d0714a9de4547710832167cd8bf79727de4417.zip | |
437825: Provide Gerrit 2.9 in the Vagrant VM
In order to test with Gerrit 2.9 provide an installation of it within
the Vagrant generated VM.
Signed-off-by: Sascha Vogt <sascha@vogt-neuenbuerg.de>
Change-Id: Ic6345e970ccc6a608921e9d532d7e0a38b2e13c4
Task-Url: https://bugs.eclipse.org/bugs/show_bug.cgi?id=437825
3 files changed, 20 insertions, 10 deletions
diff --git a/org.eclipse.mylyn.gerrit.releng/modules/gerrit/manifests/defaultsites.pp b/org.eclipse.mylyn.gerrit.releng/modules/gerrit/manifests/defaultsites.pp index f86a2af79..f0aa0c8d4 100644 --- a/org.eclipse.mylyn.gerrit.releng/modules/gerrit/manifests/defaultsites.pp +++ b/org.eclipse.mylyn.gerrit.releng/modules/gerrit/manifests/defaultsites.pp @@ -26,6 +26,9 @@ define gerrit::defaultsites ($base = $gerrit::base, $userOwner = $gerrit::userOw gerrit { "2.8.5": } + gerrit { "2.9": + } + /* Sites */ gerrit::site { "gerrit-2.6.1": @@ -42,14 +45,6 @@ define gerrit::defaultsites ($base = $gerrit::base, $userOwner = $gerrit::userOw require => Gerrit["2.7"], } - gerrit::site { "gerrit-2.8.5-dev": - version => "2.8.5", - port => 26285, - sshport => 27285, - authtype => "DEVELOPMENT_BECOME_ANY_ACCOUNT", - require => Gerrit["2.8.5"], - } - gerrit::site { "gerrit-2.8.5": version => "2.8.5", port => 28285, @@ -58,4 +53,19 @@ define gerrit::defaultsites ($base = $gerrit::base, $userOwner = $gerrit::userOw require => Gerrit["2.8.5"], } + gerrit::site { "gerrit-2.9": + version => "2.9", + port => 28290, + sshport => 29290, + require => Gerrit["2.9"], + } + + gerrit::site { "gerrit-2.9-dev": + version => "2.9", + port => 26290, + sshport => 27290, + authtype => "DEVELOPMENT_BECOME_ANY_ACCOUNT", + require => Gerrit["2.9"], + } + }
\ No newline at end of file diff --git a/org.eclipse.mylyn.gerrit.releng/modules/gerrit/manifests/init.pp b/org.eclipse.mylyn.gerrit.releng/modules/gerrit/manifests/init.pp index ce3420c18..68417786a 100644 --- a/org.eclipse.mylyn.gerrit.releng/modules/gerrit/manifests/init.pp +++ b/org.eclipse.mylyn.gerrit.releng/modules/gerrit/manifests/init.pp @@ -8,7 +8,7 @@ class gerrit { onlyif => "find /var/lib/apt/lists/ -mtime -7 | (grep -q Package; [ $? != 0 ])", } - $requirements = ["apache2", "openjdk-6-jre", "git-core",] + $requirements = ["apache2", "openjdk-7-jre", "git-core",] package { $requirements: ensure => "installed", diff --git a/org.eclipse.mylyn.gerrit.releng/modules/gerrit/templates/gerrit.config.erb b/org.eclipse.mylyn.gerrit.releng/modules/gerrit/templates/gerrit.config.erb index 541b10e22..8b1fd30e8 100644 --- a/org.eclipse.mylyn.gerrit.releng/modules/gerrit/templates/gerrit.config.erb +++ b/org.eclipse.mylyn.gerrit.releng/modules/gerrit/templates/gerrit.config.erb @@ -14,7 +14,7 @@ smtpServer = localhost [container] #user = tools - javaHome = /usr/lib/jvm/java-6-openjdk-i386/jre + javaHome = /usr/lib/jvm/java-7-openjdk-i386/jre heapLimit = 128m [sshd] listenAddress = *:<%= @sshport %> |