Merge branch 'stable-3.10' into stable-3.11
* stable-3.10:
Get global-refdb.jar from Gerrit-CI
Update base OS to AlmaLinux 9.3 and Java 17
Add missing syslog-sidecar in docker-compose.yaml
Removing obsolete version attribute in docker-compose.yaml
Bump Gerrit version to 3.10
Change-Id: I2b644337e5689ae7149363612a2a23af684a6337
diff --git a/src/test/docker/docker-compose.yaml b/src/test/docker/docker-compose.yaml
index 810cbf4..2e7981d 100644
--- a/src/test/docker/docker-compose.yaml
+++ b/src/test/docker/docker-compose.yaml
@@ -1,5 +1,3 @@
-version: '3'
-
services:
nfs-server:
@@ -110,6 +108,7 @@
volumes:
shareddir:
nfs-server-volume:
+ syslog-sidecar:
git-volume:
driver: "local"
driver_opts:
diff --git a/src/test/docker/gerrit/Dockerfile b/src/test/docker/gerrit/Dockerfile
index d8ebd5b..aeac272 100644
--- a/src/test/docker/gerrit/Dockerfile
+++ b/src/test/docker/gerrit/Dockerfile
@@ -10,8 +10,7 @@
gettext \
&& yum -y clean all
-ENV GERRIT_BRANCH master
-ENV JAVA_HOME /usr/lib/jvm/jre-17-openjdk
+ENV GERRIT_VERSION master
# Add gerrit user
RUN adduser -p -m --uid 1000 gerrit --home-dir /home/gerrit
