Revert "Provide Gerrit 2.9 (currently RC2) in the Vagrant VM"

This reverts commit 2e72b36a1bcc01abfe024fdacb2ba325022a224c.

3 files changed, 10 insertions, 20 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 f0aa0c8d4..f86a2af79 100644
--- a/org.eclipse.mylyn.gerrit.releng/modules/gerrit/manifests/defaultsites.pp
+++ b/org.eclipse.mylyn.gerrit.releng/modules/gerrit/manifests/defaultsites.pp
@@ -26,9 +26,6 @@ define gerrit::defaultsites ($base = $gerrit::base, $userOwner = $gerrit::userOw
   gerrit { "2.8.5":
   }
 
-  gerrit { "2.9":
-  }
-
   /* Sites */
 
   gerrit::site { "gerrit-2.6.1":
@@ -45,6 +42,14 @@ 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,
@@ -53,19 +58,4 @@ 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 68417786a..ce3420c18 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-7-jre", "git-core",]
+  $requirements = ["apache2", "openjdk-6-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 8b1fd30e8..541b10e22 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-7-openjdk-i386/jre
+        javaHome = /usr/lib/jvm/java-6-openjdk-i386/jre
         heapLimit = 128m
 [sshd]
         listenAddress = *:<%= @sshport %>