aboutsummaryrefslogtreecommitdiffhomepage
path: root/WORKSPACE
diff options
context:
space:
mode:
authorGravatar dmarting <dmarting@google.com>2017-07-20 12:43:58 +0200
committerGravatar Klaus Aehlig <aehlig@google.com>2017-07-20 13:07:08 +0200
commitc3e0660bf8d5c6e32ae817f8a3f52c7fc6bf039e (patch)
tree8775c3ff0ea3730d18230d2f0b406d1384a52103 /WORKSPACE
parent1a6364429c76906e67fff07dfcf5ebb3cbaf0637 (diff)
Automated rollback of commit e5f970906594d9097bb7c3736b2de1750cc8655f.
*** Reason for rollback *** Break apple test on darwin. *** Original change description *** 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... *** PiperOrigin-RevId: 162598046
Diffstat (limited to 'WORKSPACE')
-rw-r--r--WORKSPACE3
1 files changed, 1 insertions, 2 deletions
diff --git a/WORKSPACE b/WORKSPACE
index e7bf065e57..5dae9249c0 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -42,9 +42,8 @@ new_http_archive(
# 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