aboutsummaryrefslogtreecommitdiffhomepage
path: root/WORKSPACE
diff options
context:
space:
mode:
authorGravatar Damien Martin-Guillerez <dmarting@google.com>2017-07-19 14:59:44 +0200
committerGravatar Klaus Aehlig <aehlig@google.com>2017-07-19 16:50:06 +0200
commite5f970906594d9097bb7c3736b2de1750cc8655f (patch)
treefa5e13d20548ca556863074772b7017cd04c9740 /WORKSPACE
parent9bdef4370fa952097509e413689597e8431fec4b (diff)
Refactor docker tests to be buildable without docker.
This make this build a bit non-deterministic since the way it will be built depend on wether docker is installed or not. We now use the docker_pull from bazelbuild/continuous-integration to generate the base docker images and generate a fake docker binary that just error out when docker is not found so test will fails. Note that the docker_pull is set to timeout after an hour and can be extremely slow so we also set it to non quiet. Fixes #3278. Change-Id: I98d5b436e424f53981e113c1a4fd1346a5564df7 PiperOrigin-RevId: 162476033
Diffstat (limited to 'WORKSPACE')
-rw-r--r--WORKSPACE3
1 files changed, 2 insertions, 1 deletions
diff --git a/WORKSPACE b/WORKSPACE
index 08fd58595b..a86ba4e6b4 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -35,8 +35,9 @@ bind(
# For src/test/docker/...
load("//src/test/docker:docker_repository.bzl", "docker_repository")
-
docker_repository()
+load("//src/test/docker:flavours.bzl", "pull_images_for_docker_tests")
+pull_images_for_docker_tests()
# To run the Android integration tests in //src/test/shell/bazel/android:all or
# build the Android sample app in //examples/android/java/bazel:hello_world