commit 55e52d325fe3cb8a10fd76887ac580866d4429a3
author Marco Miller <marco.miller@ericsson.com> Thu Nov 28 15:42:44 2019 -0500
committer Marco Miller <marco.miller@ericsson.com> Thu Nov 28 18:32:05 2019 -0500
tree 18bc70b1bd8fe127a9e5e259a4c6e52d08aa1cfb
parent d6c07025dcd09fbb6638c29631fa73f9e2c3abc8

Docker: Allow init to write HA plugin config file

Before this change, init was unable to write the HA plugin config file
as usual. Handle the latter the same as done already for gerrit.config.

Change-Id: I0d35428cddbe95110eb9590124ea4338b4296360

src/test/docker/docker-compose.yaml

diff --git a/src/test/docker/docker-compose.yaml b/src/test/docker/docker-compose.yaml
index b64d1ba..93971b3 100644
--- a/src/test/docker/docker-compose.yaml
+++ b/src/test/docker/docker-compose.yaml
@@ -27,7 +27,7 @@
       - ./gitvolume:/var/gerrit/git
       - ./shareddir:/var/gerrit/shared/dir
       - ./etc/gerrit.config:/var/gerrit/etc/gerrit.config.orig
-      - ./etc/high-availability.gerrit-01.config:/var/gerrit/etc/high-availability.config
+      - ./etc/high-availability.gerrit-01.config:/var/gerrit/etc/high-availability.config.orig
     environment:
       - HOSTNAME=localhost
 
@@ -46,7 +46,7 @@
       - ./gitvolume:/var/gerrit/git
       - ./shareddir:/var/gerrit/shared/dir
       - ./etc/gerrit.config:/var/gerrit/etc/gerrit.config.orig
-      - ./etc/high-availability.gerrit-01.config:/var/gerrit/etc/high-availability.config
+      - ./etc/high-availability.gerrit-02.config:/var/gerrit/etc/high-availability.config.orig
     environment:
       - HOSTNAME=localhost
       - WAIT_FOR=gerrit-01:8080

src/test/docker/gerrit/start.sh

diff --git a/src/test/docker/gerrit/start.sh b/src/test/docker/gerrit/start.sh
index 454207d..8666485 100755
--- a/src/test/docker/gerrit/start.sh
+++ b/src/test/docker/gerrit/start.sh
@@ -7,7 +7,10 @@
   wait-for-it.sh $WAIT_FOR -t 600 -- echo "$WAIT_FOR is up"
 fi
 
-chown -R gerrit: /var/gerrit && sudo -u gerrit cp /var/gerrit/etc/gerrit.config.orig /var/gerrit/etc/gerrit.config
+chown -R gerrit: /var/gerrit
+
+sudo -u gerrit cp /var/gerrit/etc/gerrit.config.orig /var/gerrit/etc/gerrit.config
+sudo -u gerrit cp /var/gerrit/etc/high-availability.config.orig /var/gerrit/etc/high-availability.config
 
 if [[ ! -f /var/gerrit/git/All-Projects.git/config ]]
 then