Add back container_test (bazelbuild#249)

* Add container tests back * fix the paths
ixdy · Dec 13, 2017 · 3158116 · 3158116
1 parent e24745a
commit 3158116
Show file tree

Hide file tree

Showing 6 changed files with 62 additions and 8 deletions.
diff --git a/.ci/rules_docker.json b/.ci/rules_docker.json
@@ -1,10 +1,19 @@
 [
+    {
+        "node": "docker",
+        "parameters": {
+            "tests": ["//tests/docker/..."]
+        }
+    },
     {
           "variation": "",
            "configurations": [
                 {"node": "linux-x86_64"},
                 {"node": "ubuntu_16.04-x86_64"},
                 {"node": "darwin-x86_64"}
-           ]
+           ],
+           "parameters": {
+               "tests": ["//... except //tests/docker/..."]
+           }
     }
 ]
diff --git a/testdata/BUILD b/testdata/BUILD
@@ -20,7 +20,6 @@ load(
     "container_flatten",
     "container_image",
     "container_import",
-    # "container_test",
 )
 
 exports_files(["pause.tar"])
@@ -277,12 +276,6 @@ container_flatten(
     image = ":link_with_files_base",
 )
 
-# container_test(
-#     name = "structure_test",
-#     configs = ["test.yaml"],
-#     image = ":link_with_files_base",
-# )
-
 load("//docker:docker.bzl", "docker_push")
 
 docker_push(

diff --git a/tests/BUILD b/tests/BUILD
@@ -0,0 +1,15 @@
+# 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.
+
+package(default_visibility = ["//visibility:public"])
diff --git a/tests/docker/BUILD b/tests/docker/BUILD
@@ -0,0 +1,22 @@
+# 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.
+package(default_visibility = ["//visibility:public"])
+
+load("//contrib:test.bzl", "container_test")
+
+container_test(
+    name = "structure_test",
+    configs = ["//tests/docker/configs:test.yaml"],
+    image = "//testdata:link_with_files_base",
+)
diff --git a/tests/docker/configs/BUILD b/tests/docker/configs/BUILD
@@ -0,0 +1,15 @@
+# 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.
+
+exports_files(glob(["*.yaml"]))
diff --git a/testdata/test.yaml → tests/docker/configs/test.yaml b/testdata/test.yaml → tests/docker/configs/test.yaml