Update test to check against latest configs.
Change-Id: I1acd40374658991c5a36aa5a70b8ce70730abf0b
diff --git a/WORKSPACE b/WORKSPACE
index aafef11..f73667b 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -49,15 +49,6 @@
repository = "cloud-marketplace/google/clang-debian8",
)
-# Created for //test:debian8_clang_autoconfig_test.
-# Do not modify the container sha.
-container_pull(
- name = "debian8-clang-test",
- digest = "sha256:e57978199c9eb156bd7f63773387f3a238adf61acd71c4942ad91da50b4f241f",
- registry = "gcr.io",
- repository = "cloud-marketplace/google/clang-debian8",
-)
-
container_pull(
name = "official_jessie",
registry = "index.docker.io",
@@ -191,9 +182,9 @@
# https://github.com/bazelbuild/bazel-toolchains/releases/tag/acffd62
http_file(
name = "bazel_toolchains_test",
- sha256 = "f820436a685db00945df1282df7688187b48aeed91c17686023712afcf453996",
+ sha256 = "699b55a6916c687f4b7dc092dbbf5f64672cde0dc965f79717735ec4e5416556",
urls = [
- "https://mirror.bazel.build/github.com/bazelbuild/bazel-toolchains/archive/acffd62731b1545c32e1c34e72fd526598ab9a66.tar.gz",
- "https://github.com/bazelbuild/bazel-toolchains/archive/acffd62731b1545c32e1c34e72fd526598ab9a66.tar.gz",
+ "https://mirror.bazel.build/github.com/bazelbuild/bazel-toolchains/archive/44200e0c026d86c53470d107b3697a3e46469c43.tar.gz",
+ "https://github.com/bazelbuild/bazel-toolchains/archive/44200e0c026d86c53470d107b3697a3e46469c43.tar.gz",
],
)
diff --git a/rules/docker_config.bzl b/rules/docker_config.bzl
index 7ecb45d..75e079d 100644
--- a/rules/docker_config.bzl
+++ b/rules/docker_config.bzl
@@ -460,6 +460,7 @@
timeout = "long",
srcs = ["//test:autoconfig_test.sh"],
data = [":" + kwargs["name"]],
+ tags = ["manual"],
)
docker_toolchain_autoconfig_(**kwargs)
diff --git a/test/BUILD b/test/BUILD
index 2ed03c2..604c914 100644
--- a/test/BUILD
+++ b/test/BUILD
@@ -203,43 +203,13 @@
test = True,
)
-# Created for test. Pin to use the following container:
-# gcr.io/cloud-marketplace/google/clang-debian8@sha256:e57978199c9eb156bd7f63773387f3a238adf61acd71c4942ad91da50b4f241f
-docker_toolchain_autoconfig(
- name = "debian8-clang-0.2.0-bazel_0.10.0-autoconfig-for-test",
- additional_repos = [
- "deb http://deb.debian.org/debian jessie-backports main",
- "deb [arch=amd64] http://storage.googleapis.com/bazel-apt stable jdk1.8",
- ],
- base = "@debian8-clang-test//image",
- bazel_version = "0.10.0",
- env = clang_env(),
- keys = [
- "@bazel_gpg//file",
- ],
- packages = [
- "bazel",
- "ca-certificates-java=20161107'*'",
- "curl",
- "git",
- "openjdk-8-jdk-headless",
- "openjdk-8-jre-headless",
- "python-dev",
- "unzip",
- "wget",
- "zip",
- ],
- tags = ["manual"],
- test = True,
-)
-
sh_test(
name = "debian8_clang_autoconfig_test",
size = "medium",
timeout = "long",
srcs = ["debian8_clang_autoconfig_test.sh"],
data = [
- "//test:debian8-clang-0.2.0-bazel_0.10.0-autoconfig-for-test",
+ "//rules:debian8-clang-0.3.0-bazel_0.10.0-autoconfig",
"@bazel_toolchains_test//file",
],
)
diff --git a/test/debian8_clang_autoconfig_test.sh b/test/debian8_clang_autoconfig_test.sh
index b2eb7c1..a2188d3 100755
--- a/test/debian8_clang_autoconfig_test.sh
+++ b/test/debian8_clang_autoconfig_test.sh
@@ -24,17 +24,18 @@
# Define constants.
WORKSPACE_ROOT=$(pwd)
-COMMIT=acffd62731b1545c32e1c34e72fd526598ab9a66
+COMMIT=44200e0c026d86c53470d107b3697a3e46469c43
BAZEL_VERSION=0.10.0
-TEST_CONFIGS_DIR=${TEST_TMPDIR}/bazel-toolchains-${COMMIT}/configs/debian8_clang/0.2.0/bazel_${BAZEL_VERSION}/
-AUTOCONFIG_SCRIPT=${WORKSPACE_ROOT}/test/debian8-clang-0.2.0-bazel_${BAZEL_VERSION}-autoconfig-for-test
+CONFIG_VERSION=0.3.0
+TEST_CONFIGS_DIR=${TEST_TMPDIR}/bazel-toolchains-${COMMIT}/configs/debian8_clang/${CONFIG_VERSION}/bazel_${BAZEL_VERSION}/
+AUTOCONFIG_SCRIPT=${WORKSPACE_ROOT}/rules/debian8-clang-${CONFIG_VERSION}-bazel_${BAZEL_VERSION}-autoconfig
# Change the output location to a tmp location inside the current Bazel workspace.
sed -i "s|/tmp|${TEST_TMPDIR}|g" ${AUTOCONFIG_SCRIPT}
# Execute the autoconfig script and unpack toolchain config tarball.
${AUTOCONFIG_SCRIPT}
-tar -xf ${TEST_TMPDIR}/debian8-clang-0.2.0-bazel_${BAZEL_VERSION}-autoconfig-for-test.tar -C ${TEST_TMPDIR}
+tar -xf ${TEST_TMPDIR}/debian8-clang-${CONFIG_VERSION}-bazel_${BAZEL_VERSION}-autoconfig.tar -C ${TEST_TMPDIR}
# Remove generated files that are not part of toolchain configs
rm -rf ${TEST_TMPDIR}/local_config_cc/tools ${TEST_TMPDIR}/local_config_cc/WORKSPACE
