Enable docker-based tests in Gerrit verification build
Make sure that the DOCKER_HOST variable is set and use it
for running the Docker-based tests in Gerrit.
Change-Id: I0049ca807cd699344a26f43d407b93defc800aae
diff --git a/jenkins/gerrit-bazel-template.yaml b/jenkins/gerrit-bazel-template.yaml
index 8b7759d..b5bb33e 100644
--- a/jenkins/gerrit-bazel-template.yaml
+++ b/jenkins/gerrit-bazel-template.yaml
@@ -41,6 +41,7 @@
xml: <jenkins.plugins.logstash.LogstashBuildWrapper plugin="logstash@1.2.0"/>
builders:
- shell: !include-raw: gerrit-bazel-build.sh
+ - shell: !include-raw-escape: set-docker-host.sh
- shell: !include-raw: gerrit-bazel-test.sh
- shell: !include-raw-escape: gerrit-bazel-cat-test-log.sh
- shell: !include-raw: gerrit-deploy-api.sh
diff --git a/jenkins/gerrit-bazel-test.sh b/jenkins/gerrit-bazel-test.sh
index a7d5563..5be885e 100755
--- a/jenkins/gerrit-bazel-test.sh
+++ b/jenkins/gerrit-bazel-test.sh
@@ -8,7 +8,7 @@
--test_summary detailed --flaky_test_attempts 3 \
--test_verbose_timeout_warnings --build_tests_only \
--test_timeout 3600 \
- --test_tag_filters=-flaky,-docker \
+ --test_tag_filters=-flaky \
--test_env DOCKER_HOST=$DOCKER_HOST"
java -fullversion
diff --git a/jenkins/gerrit-bazel-verifier-test.sh b/jenkins/gerrit-bazel-verifier-test.sh
index d74bf34..32e318b 100755
--- a/jenkins/gerrit-bazel-verifier-test.sh
+++ b/jenkins/gerrit-bazel-verifier-test.sh
@@ -12,7 +12,7 @@
--test_summary detailed --flaky_test_attempts 3 \
--test_verbose_timeout_warnings --build_tests_only \
--test_timeout 3600 \
- --test_tag_filters=-flaky,-docker \
+ --test_tag_filters=-flaky \
--test_env DOCKER_HOST=$DOCKER_HOST"
java -fullversion
diff --git a/jenkins/gerrit-verifier.yaml b/jenkins/gerrit-verifier.yaml
index 960e0c7..a1b2494 100644
--- a/jenkins/gerrit-verifier.yaml
+++ b/jenkins/gerrit-verifier.yaml
@@ -116,6 +116,7 @@
- merge-target-branch
- fetch-all-submodules
- shell: !include-raw-escape: gerrit-bazel-build.sh
+ - shell: !include-raw-escape: set-docker-host.sh
- shell: !include-raw-escape: gerrit-bazel-verifier-test.sh
- shell: !include-raw-escape: gerrit-bazel-cat-test-log.sh
publishers:
diff --git a/jenkins/set-docker-host.sh b/jenkins/set-docker-host.sh
new file mode 100755
index 0000000..15e66fa
--- /dev/null
+++ b/jenkins/set-docker-host.sh
@@ -0,0 +1,2 @@
+#!/bin/bash -e
+export DOCKER_HOST=`/sbin/ip route|awk '/default/ {print "tcp://"$3":2375"}'`
