Bump Gerrit to v3.2.0-rc1
Change-Id: I9f03d123108b8a57610b4666ecad4df1071b9ab8
diff --git a/gerrit/Dockerfile b/gerrit/Dockerfile
index 93051f6..58a7226 100644
--- a/gerrit/Dockerfile
+++ b/gerrit/Dockerfile
@@ -1,10 +1,9 @@
-FROM gerritcodereview/gerrit:3.1.4-centos7
+FROM gerritcodereview/gerrit:3.2.0-rc1-centos8
USER root
-RUN yum install -y https://centos7.iuscommunity.org/ius-release.rpm \
- && yum update -y \
- && yum install -y python36u python36u-libs python36u-devel python36u-pip
+RUN yum update -y \
+ && yum install -y python36 python3-libs python36-devel python3-pip
COPY --chown=gerrit:gerrit ssh-config /var/gerrit/.ssh/config
diff --git a/gerrit/Makefile b/gerrit/Makefile
index 6b493ea..8440236 100644
--- a/gerrit/Makefile
+++ b/gerrit/Makefile
@@ -1,6 +1,6 @@
include ../$(RECIPE)/setup.env
-GERRIT_BRANCH=stable-3.0
+GERRIT_BRANCH=stable-3.2
GERRIT_CI=https://gerrit-ci.gerritforge.com/view/Plugins-$(GERRIT_BRANCH)/job
LAST_BUILD=lastSuccessfulBuild/artifact/bazel-bin/plugins
@@ -17,7 +17,7 @@
|| { echo >&2 "Cannot download metrics-reporter-prometheus plugin: Check internet connection. Aborting"; exit 1; }
@echo "Downloading javamelody plugin $(GERRIT_BRANCH)"
- wget $(GERRIT_CI)/plugin-javamelody-bazel-$(GERRIT_BRANCH)/$(LAST_BUILD)/javamelody/javamelody.jar \
+ wget $(GERRIT_CI)/plugin-javamelody-bazel-master-$(GERRIT_BRANCH)/$(LAST_BUILD)/javamelody/javamelody.jar \
-O ./plugins/javamelody.jar \
|| { echo >&2 "Cannot download javamelody plugin: Check internet connection. Aborting"; exit 1; }
diff --git a/gerrit/etc/gerrit.config.template b/gerrit/etc/gerrit.config.template
index 26fcb9f..630f1cb 100644
--- a/gerrit/etc/gerrit.config.template
+++ b/gerrit/etc/gerrit.config.template
@@ -41,7 +41,7 @@
javaOptions = "-Dflogger.backend_factory=com.google.common.flogger.backend.log4j.Log4jBackendFactory#getInstance"
javaOptions = "-Dflogger.logging_context=com.google.gerrit.server.logging.LoggingContext#getInstance"
user = gerrit
- javaHome = /usr/lib/jvm/java-1.8.0-openjdk-1.8.0.242.b08-0.el7_7.x86_64/jre
+ javaHome = /usr/lib/jvm/jre
javaOptions = -Djava.security.egd=file:/dev/./urandom
[receive]
enableSignedPush = false
