Update rules_docker pin and fix yamls. (#113)
* Update rules_docker pin and fix yamls.
The structure test had a bug which it doesn't fail on broken yaml files.
This is now fixed. See
https://github.com/GoogleContainerTools/container-structure-test/issues/146
for context.
* Reenable disabled test and update config tests.
diff --git a/.bazelci/presubmit.yml b/.bazelci/presubmit.yml
index b79200e..bb07c37 100644
--- a/.bazelci/presubmit.yml
+++ b/.bazelci/presubmit.yml
@@ -9,16 +9,15 @@
- "//test/configs:ubuntu-xenial-bazel-head-autoconfig_test"
- "//test/configs:ubuntu-xenial-custom-bazel-rc-version-autoconfig_test"
- "//test/configs:debian8_clang_autoconfig_test"
- - "//configs/debian8_clang:debian8-clang-0.3.0-bazel_0.13.0-autoconfig_test"
- - "//configs/debian8_clang:msan-debian8-clang-0.3.0-bazel_0.13.0-autoconfig_test"
- - "//configs/ubuntu16_04_clang:ubuntu16_04-clang-1.0-bazel_0.13.0-autoconfig_test"
- - "//configs/ubuntu16_04_clang:msan-ubuntu16_04-clang-1.0-bazel_0.13.0-autoconfig_test"
+ - "//configs/debian8_clang:debian8-clang-0.3.0-bazel_0.14.1-autoconfig_test"
+ - "//configs/debian8_clang:msan-debian8-clang-0.3.0-bazel_0.14.1-autoconfig_test"
+ - "//configs/ubuntu16_04_clang:ubuntu16_04-clang-1.0-bazel_0.14.1-autoconfig_test"
+ - "//configs/ubuntu16_04_clang:msan-ubuntu16_04-clang-1.0-bazel_0.14.1-autoconfig_test"
- "//container/debian8/builders/rbe-debian8:toolchain-test"
- "//container/ubuntu16_04/builders/rbe-ubuntu16_04:toolchain-test"
- "//container/experimental/rbe-debian9:toolchain-test"
- "//container/ubuntu16_04/builders/bazel:bazel-test"
- # TODO(xingao) Re-enable the test.
- # - "//container/ubuntu16_04/builders/bazel:bazel_docker-test"
+ - "//container/ubuntu16_04/builders/bazel:bazel_docker-test"
test_flags:
- "--test_output=errors"
- "--verbose_failures"
@@ -31,16 +30,15 @@
- "//test/configs:ubuntu-xenial-bazel-head-autoconfig_test"
- "//test/configs:ubuntu-xenial-custom-bazel-rc-version-autoconfig_test"
- "//test/configs:debian8_clang_autoconfig_test"
- - "//configs/debian8_clang:debian8-clang-0.3.0-bazel_0.13.0-autoconfig_test"
- - "//configs/debian8_clang:msan-debian8-clang-0.3.0-bazel_0.13.0-autoconfig_test"
- - "//configs/ubuntu16_04_clang:ubuntu16_04-clang-1.0-bazel_0.13.0-autoconfig_test"
- - "//configs/ubuntu16_04_clang:msan-ubuntu16_04-clang-1.0-bazel_0.13.0-autoconfig_test"
+ - "//configs/debian8_clang:debian8-clang-0.3.0-bazel_0.14.1-autoconfig_test"
+ - "//configs/debian8_clang:msan-debian8-clang-0.3.0-bazel_0.14.1-autoconfig_test"
+ - "//configs/ubuntu16_04_clang:ubuntu16_04-clang-1.0-bazel_0.14.1-autoconfig_test"
+ - "//configs/ubuntu16_04_clang:msan-ubuntu16_04-clang-1.0-bazel_0.14.1-autoconfig_test"
- "//container/debian8/builders/rbe-debian8:toolchain-test"
- "//container/ubuntu16_04/builders/rbe-ubuntu16_04:toolchain-test"
- "//container/experimental/rbe-debian9:toolchain-test"
- "//container/ubuntu16_04/builders/bazel:bazel-test"
- # TODO(xingao) Re-enable the test.
- # - "//container/ubuntu16_04/builders/bazel:bazel_docker-test"
+ - "//container/ubuntu16_04/builders/bazel:bazel_docker-test"
test_flags:
- "--test_output=errors"
- "--verbose_failures"
diff --git a/container/common/clang.yaml b/container/common/clang.yaml
index c4cabe9..e77ba01 100644
--- a/container/common/clang.yaml
+++ b/container/common/clang.yaml
@@ -8,67 +8,51 @@
fileExistenceTests:
- name: 'Clang'
- isDirectory: false
path: '/usr/local/bin/clang'
shouldExist: true
- name: 'libcxx-header'
- isDirectory: true
path: '/usr/local/include/c++/v1'
shouldExist: true
- name: 'libcxx-lib'
- isDirectory: false
path: '/usr/local/lib/libc++.a'
shouldExist: true
- name: 'llvm-symbolizer'
- isDirectory: false
path: '/usr/local/bin/llvm-symbolizer'
shouldExist: true
- name: 'sanitizer'
- isDirectory: true
path: '/usr/local/lib/clang/7.0.0/include/sanitizer'
shouldExist: true
- name: 'sanitizer-allocator'
- isDirectory: false
path: '/usr/local/lib/clang/7.0.0/include/sanitizer/allocator_interface.h'
shouldExist: true
- name: 'sanitizer-asan'
- isDirectory: false
path: '/usr/local/lib/clang/7.0.0/include/sanitizer/asan_interface.h'
shouldExist: true
- name: 'sanitizer-common_defs'
- isDirectory: false
path: '/usr/local/lib/clang/7.0.0/include/sanitizer/common_interface_defs.h'
shouldExist: true
- name: 'sanitizer-coverage'
- isDirectory: false
path: '/usr/local/lib/clang/7.0.0/include/sanitizer/coverage_interface.h'
shouldExist: true
- name: 'sanitizer-dfsan'
- isDirectory: false
path: '/usr/local/lib/clang/7.0.0/include/sanitizer/dfsan_interface.h'
shouldExist: true
- name: 'sanitizer-esan'
- isDirectory: false
path: '/usr/local/lib/clang/7.0.0/include/sanitizer/esan_interface.h'
shouldExist: true
- name: 'sanitizer-linux_syscall_hooks'
- isDirectory: false
path: '/usr/local/lib/clang/7.0.0/include/sanitizer/linux_syscall_hooks.h'
shouldExist: true
- name: 'sanitizer-lsan'
- isDirectory: false
path: '/usr/local/lib/clang/7.0.0/include/sanitizer/lsan_interface.h'
shouldExist: true
- name: 'sanitizer-msan'
- isDirectory: false
path: '/usr/local/lib/clang/7.0.0/include/sanitizer/msan_interface.h'
shouldExist: true
- name: 'sanitizer-tsan_atomic'
- isDirectory: false
path: '/usr/local/lib/clang/7.0.0/include/sanitizer/tsan_interface_atomic.h'
shouldExist: true
- name: 'sanitizer-tsan'
- isDirectory: false
path: '/usr/local/lib/clang/7.0.0/include/sanitizer/tsan_interface.h'
shouldExist: true
diff --git a/container/common/go.yaml b/container/common/go.yaml
index c9e4f01..1d82d58 100644
--- a/container/common/go.yaml
+++ b/container/common/go.yaml
@@ -8,7 +8,6 @@
fileExistenceTests:
- name: 'Golang'
- isDirectory: false
path: '/usr/local/go/bin/go'
shouldExist: true
diff --git a/container/common/java.yaml b/container/common/java.yaml
index 1bf8111..b45e0c1 100644
--- a/container/common/java.yaml
+++ b/container/common/java.yaml
@@ -13,7 +13,6 @@
fileExistenceTests:
- name: 'OpenJDK'
- isDirectory: true
path: '/usr/lib/jvm/java-8-openjdk-amd64'
shouldExist: true
diff --git a/container/common/python2.yaml b/container/common/python2.yaml
index e7fe656..8582e44 100644
--- a/container/common/python2.yaml
+++ b/container/common/python2.yaml
@@ -9,6 +9,5 @@
fileExistenceTests:
- name: 'Python2'
- isDirectory: false
path: '/usr/bin/python2.7'
shouldExist: true
diff --git a/container/common/rbe-base.yaml b/container/common/rbe-base.yaml
index ddd2b5e..0fe1eea 100644
--- a/container/common/rbe-base.yaml
+++ b/container/common/rbe-base.yaml
@@ -37,7 +37,6 @@
fileExistenceTests:
- name: 'Root'
- isDirectory: true
path: '/'
shouldExist: true
diff --git a/container/debian8/builders/rbe-debian8/rbe-debian8.yaml b/container/debian8/builders/rbe-debian8/rbe-debian8.yaml
index e222900..256d813 100644
--- a/container/debian8/builders/rbe-debian8/rbe-debian8.yaml
+++ b/container/debian8/builders/rbe-debian8/rbe-debian8.yaml
@@ -2,7 +2,6 @@
fileExistenceTests:
- name: 'Python3'
- isDirectory: false
path: '/opt/python3.6/bin/python3'
shouldExist: true
diff --git a/container/experimental/rbe-debian9/rbe-debian9.yaml b/container/experimental/rbe-debian9/rbe-debian9.yaml
index 20ce8cc..228ff5f 100644
--- a/container/experimental/rbe-debian9/rbe-debian9.yaml
+++ b/container/experimental/rbe-debian9/rbe-debian9.yaml
@@ -8,7 +8,6 @@
fileExistenceTests:
- name: 'Python3'
- isDirectory: false
path: '/usr/bin/python3'
shouldExist: true
diff --git a/container/ubuntu16_04/builders/rbe-ubuntu16_04/rbe-ubuntu16_04.yaml b/container/ubuntu16_04/builders/rbe-ubuntu16_04/rbe-ubuntu16_04.yaml
index e222900..256d813 100644
--- a/container/ubuntu16_04/builders/rbe-ubuntu16_04/rbe-ubuntu16_04.yaml
+++ b/container/ubuntu16_04/builders/rbe-ubuntu16_04/rbe-ubuntu16_04.yaml
@@ -2,7 +2,6 @@
fileExistenceTests:
- name: 'Python3'
- isDirectory: false
path: '/opt/python3.6/bin/python3'
shouldExist: true
diff --git a/repositories/repositories.bzl b/repositories/repositories.bzl
index 932d7e8..ab19996 100644
--- a/repositories/repositories.bzl
+++ b/repositories/repositories.bzl
@@ -24,9 +24,9 @@
if "io_bazel_rules_docker" not in excludes:
http_archive(
name = "io_bazel_rules_docker",
- sha256 = "88890f58983b683f12c04ed14611b34c9f0140d8bfbdc089594187dc5d4025a5",
- strip_prefix = "rules_docker-a901aa066469d6840d254d6f5618b90a8ec983dc",
- urls = ["https://github.com/bazelbuild/rules_docker/archive/a901aa066469d6840d254d6f5618b90a8ec983dc.tar.gz"],
+ sha256 = "b1fb58b32f4bf26fc64313c6d1d5dc415579be0eb3411e8845df72c699958fc1",
+ strip_prefix = "rules_docker-090f1e6214dcfa34a48b1440c97df4e9721fb921",
+ urls = ["https://github.com/bazelbuild/rules_docker/archive/090f1e6214dcfa34a48b1440c97df4e9721fb921.tar.gz"],
)
# io_bazel_rules_go is the dependency of container_test rules.
