diff options
author | 2017-07-20 12:43:58 +0200 | |
---|---|---|
committer | 2017-07-20 13:07:08 +0200 | |
commit | c3e0660bf8d5c6e32ae817f8a3f52c7fc6bf039e (patch) | |
tree | 8775c3ff0ea3730d18230d2f0b406d1384a52103 /src/test/docker/flavours.bzl | |
parent | 1a6364429c76906e67fff07dfcf5ebb3cbaf0637 (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 'src/test/docker/flavours.bzl')
-rw-r--r-- | src/test/docker/flavours.bzl | 37 |
1 files changed, 0 insertions, 37 deletions
diff --git a/src/test/docker/flavours.bzl b/src/test/docker/flavours.bzl deleted file mode 100644 index 713c7c5243..0000000000 --- a/src/test/docker/flavours.bzl +++ /dev/null @@ -1,37 +0,0 @@ -# Copyright 2017 The Bazel Authors. All rights reserved. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -"""Create base images for docker tests.""" -# TODO(dmarting): Right now we use a custom docker_pull that can build -# docker images, which is not reproducible and as a high cost, ideally -# we would switch to the docker_pull from bazelbuild/rules_docker but -# we do not have an easy mean to create and maintain the images we need -# for those tests. -load("//src/test/docker:docker_pull.bzl", "docker_pull") - -FLAVOURS = [ - "centos6.7", - "debian-stretch", - "fedora23", - "ubuntu-15.04", - "ubuntu-16.04", -] - -def pull_images_for_docker_tests(): - for flavour in FLAVOURS: - docker_pull( - name = "docker-" + flavour, - tag = "bazel_tools_cpp_test:" + flavour, - dockerfile = "//src/test/docker:Dockerfile." + flavour, - optional = True, - ) |