Merge branch 'stable-3.3'

* stable-3.3:
  Bump Gerrit to v3.3.7 in docker-based tests
  Rely on internal volumes for the Docker-based test env
  Pin haproxy to 1.8.30-buster and fix associated issues

Change-Id: Iefedb15a6c919acb556d658e808c5b6b7919d8d9

src/test/docker/docker-compose.yaml

diff --git a/src/test/docker/docker-compose.yaml b/src/test/docker/docker-compose.yaml
index 647aa6d..42c12c9 100644
--- a/src/test/docker/docker-compose.yaml
+++ b/src/test/docker/docker-compose.yaml
@@ -11,8 +11,8 @@
       - gerrit-net
     volumes:
       - /dev/urandom:/dev/random
-      - ./gitvolume:/var/gerrit/git
-      - ./shareddir:/var/gerrit/shared/dir
+      - gitvolume:/var/gerrit/git
+      - shareddir:/var/gerrit/shareddir
       - ./etc/gerrit.config:/var/gerrit/etc/gerrit.config.orig
       - ./etc/high-availability.gerrit-01.config:/var/gerrit/etc/high-availability.config.orig
     environment:
@@ -29,8 +29,8 @@
       - gerrit-01
     volumes:
       - /dev/urandom:/dev/random
-      - ./gitvolume:/var/gerrit/git
-      - ./shareddir:/var/gerrit/shared/dir
+      - gitvolume:/var/gerrit/git
+      - shareddir:/var/gerrit/shareddir
       - ./etc/gerrit.config:/var/gerrit/etc/gerrit.config.orig
       - ./etc/high-availability.gerrit-02.config:/var/gerrit/etc/high-availability.config.orig
     environment:
@@ -47,6 +47,7 @@
     volumes:
       - syslog-sidecar
     depends_on:
+      - syslog-sidecar
       - gerrit-01
       - gerrit-02
 
@@ -61,3 +62,5 @@
 
 volumes:
   syslog-sidecar:
+  shareddir:
+  gitvolume:

src/test/docker/etc/high-availability.gerrit-01.config

diff --git a/src/test/docker/etc/high-availability.gerrit-01.config b/src/test/docker/etc/high-availability.gerrit-01.config
index f269f52..a21f05c 100644
--- a/src/test/docker/etc/high-availability.gerrit-01.config
+++ b/src/test/docker/etc/high-availability.gerrit-01.config
@@ -1,5 +1,5 @@
 [main]
-  sharedDirectory = /var/gerrit/shared/dir
+  sharedDirectory = /var/gerrit/shareddir
 
 [peerInfo]
   strategy = static

src/test/docker/etc/high-availability.gerrit-02.config

diff --git a/src/test/docker/etc/high-availability.gerrit-02.config b/src/test/docker/etc/high-availability.gerrit-02.config
index b49f91b..d05c7ec 100644
--- a/src/test/docker/etc/high-availability.gerrit-02.config
+++ b/src/test/docker/etc/high-availability.gerrit-02.config
@@ -1,5 +1,5 @@
 [main]
-  sharedDirectory = /var/gerrit/shared/dir
+  sharedDirectory = /var/gerrit/shareddir
 
 [peerInfo]
   strategy = static

src/test/docker/gerrit/Dockerfile

diff --git a/src/test/docker/gerrit/Dockerfile b/src/test/docker/gerrit/Dockerfile
index 3c74b10..7269a3a 100644
--- a/src/test/docker/gerrit/Dockerfile
+++ b/src/test/docker/gerrit/Dockerfile
@@ -1,6 +1,6 @@
-FROM gerritcodereview/gerrit:3.2.10
+FROM gerritcodereview/gerrit:3.3.7 
 
-ENV GERRIT_BRANCH=stable-3.2
+ENV GERRIT_BRANCH=stable-3.3
 
 ENV GERRIT_CI_URL=https://gerrit-ci.gerritforge.com/job
 
@@ -10,7 +10,7 @@
 
 USER gerrit
 
-ADD --chown=gerrit:gerrit $GERRIT_CI_URL/plugin-javamelody-bazel-$GERRIT_BRANCH/lastSuccessfulBuild/artifact/bazel-bin/plugins/javamelody/javamelody.jar /var/gerrit/plugins/javamelody.jar
+ADD --chown=gerrit:gerrit $GERRIT_CI_URL/plugin-javamelody-bazel-master-$GERRIT_BRANCH/lastSuccessfulBuild/artifact/bazel-bin/plugins/javamelody/javamelody.jar /var/gerrit/plugins/javamelody.jar
 ADD --chown=gerrit:gerrit $GERRIT_CI_URL/plugin-high-availability-bazel-$GERRIT_BRANCH/lastSuccessfulBuild/artifact/bazel-bin/plugins/high-availability/high-availability.jar /var/gerrit/plugins/high-availability.jar
 
 USER root

src/test/docker/gerrit/start.sh

diff --git a/src/test/docker/gerrit/start.sh b/src/test/docker/gerrit/start.sh
index 0dae4c3..d906628 100755
--- a/src/test/docker/gerrit/start.sh
+++ b/src/test/docker/gerrit/start.sh
@@ -12,6 +12,7 @@
 then
   echo "Initializing Gerrit site ..."
   sudo -u gerrit java -jar /var/gerrit/bin/gerrit.war init -d /var/gerrit --batch
+  chown -R gerrit: /var/gerrit/shareddir
 fi
 
 echo "Reindexing Gerrit ..."

src/test/docker/haproxy/Dockerfile

diff --git a/src/test/docker/haproxy/Dockerfile b/src/test/docker/haproxy/Dockerfile
index 72cad4a..eb5920a 100644
--- a/src/test/docker/haproxy/Dockerfile
+++ b/src/test/docker/haproxy/Dockerfile
@@ -1,8 +1,5 @@
-FROM haproxy:1.8
+FROM haproxy:1.8.30-buster
+
+RUN mkdir -p /var/run/haproxy && chown -R haproxy: /var/run/haproxy
 
 COPY haproxy.cfg /usr/local/etc/haproxy/haproxy.cfg
-
-RUN mkdir /var/lib/haproxy && \
-    mkdir /var/run/haproxy && \
-    useradd haproxy && \
-    chown haproxy: /var/lib/haproxy /var/run/haproxy