Merge branch 'stable-3.12' into stable-3.13
* stable-3.12:
Reduce HTTP check internal to 1s in Docker tests
Use healthcheck plugin for Docker tests
Change-Id: I83572cf9efff6c0e08c2c1b6962f68354743e41a
diff --git a/src/test/docker/gerrit/Dockerfile b/src/test/docker/gerrit/Dockerfile
index 4d41d22..d18e060 100644
--- a/src/test/docker/gerrit/Dockerfile
+++ b/src/test/docker/gerrit/Dockerfile
@@ -49,6 +49,10 @@
"https://gerrit-ci.gerritforge.com/view/Plugins-master/job/module-index-elasticsearch-bazel-master/lastSuccessfulBuild/artifact/bazel-bin/plugins/index-elasticsearch/index-elasticsearch.jar" \
/var/gerrit_plugins/index-elasticsearch.jar
+ADD --chown=gerrit:gerrit \
+ "https://gerrit-ci.gerritforge.com/job/plugin-healthcheck-bazel-$GERRIT_BRANCH/lastSuccessfulBuild/artifact/bazel-bin/plugins/healthcheck/healthcheck.jar" \
+ /var/gerrit/plugins/healthcheck.jar
+
ADD --chown=gerrit:gerrit ./wait-for-it.sh /bin
# Change user
diff --git a/src/test/docker/haproxy/haproxy.cfg b/src/test/docker/haproxy/haproxy.cfg
index 07a6746..a068802 100644
--- a/src/test/docker/haproxy/haproxy.cfg
+++ b/src/test/docker/haproxy/haproxy.cfg
@@ -44,15 +44,15 @@
balance source
timeout connect 10s
timeout server 5m
- server gerrit_ssh_01 gerrit-01:29418 check port 8080 inter 10s fall 3 rise 2
- server gerrit-ssh_02 gerrit-02:29418 check port 8080 inter 10s fall 3 rise 2
+ server gerrit_ssh_01 gerrit-01:29418 check port 8080 inter 1s fall 3 rise 2
+ server gerrit-ssh_02 gerrit-02:29418 check port 8080 inter 1s fall 3 rise 2
backend gerrit_http_nodes
mode http
balance source
option forwardfor
- default-server inter 10s fall 3 rise 2
- option httpchk GET /config/server/version HTTP/1.0
+ default-server inter 1s fall 3 rise 2
+ option httpchk GET /config/server/healthcheck~status HTTP/1.0
http-check expect status 200
server gerrit_01 gerrit-01:8080 check
server gerrit_02 gerrit-02:8080 check
@@ -61,8 +61,8 @@
mode http
balance source
option forwardfor
- default-server inter 10s fall 3 rise 2
- option httpchk GET /config/server/version HTTP/1.0
+ default-server inter 1s fall 3 rise 2
+ option httpchk GET /config/server/healthcheck~status HTTP/1.0
http-check expect status 200
server gerrit_01 gerrit-01:8080 check
server gerrit_02 gerrit-02:8080 check
