Remove use of external folder and update tests to stop using old versions of Bazel (#150) * update tests to stop using old versions of Bazel * removing use of external folder to access tar for default autoconfig project
diff --git a/.bazelci/presubmit.yml b/.bazelci/presubmit.yml index 75be538..91aff76 100644 --- a/.bazelci/presubmit.yml +++ b/.bazelci/presubmit.yml
@@ -9,10 +9,10 @@ - "//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.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" + - "//configs/debian8_clang:debian8-clang-0.3.0-bazel_0.15.0-autoconfig_test" + - "//configs/debian8_clang:msan-debian8-clang-0.3.0-bazel_0.15.0-autoconfig_test" + - "//configs/ubuntu16_04_clang:ubuntu16_04-clang-1.0-bazel_0.15.0-autoconfig_test" + - "//configs/ubuntu16_04_clang:msan-ubuntu16_04-clang-1.0-bazel_0.15.0-autoconfig_test" - "//container/debian8/builders/rbe-debian8:toolchain-test" - "//container/ubuntu16_04/builders/rbe-ubuntu16_04:toolchain-test" - "//container/experimental/rbe-debian9:toolchain-test" @@ -30,10 +30,10 @@ - "//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.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" + - "//configs/debian8_clang:debian8-clang-0.3.0-bazel_0.15.0-autoconfig_test" + - "//configs/debian8_clang:msan-debian8-clang-0.3.0-bazel_0.15.0-autoconfig_test" + - "//configs/ubuntu16_04_clang:ubuntu16_04-clang-1.0-bazel_0.15.0-autoconfig_test" + - "//configs/ubuntu16_04_clang:msan-ubuntu16_04-clang-1.0-bazel_0.15.0-autoconfig_test" - "//container/debian8/builders/rbe-debian8:toolchain-test" - "//container/ubuntu16_04/builders/rbe-ubuntu16_04:toolchain-test" - "//container/experimental/rbe-debian9:toolchain-test"
diff --git a/rules/docker_config.bzl b/rules/docker_config.bzl index ca33340..e2e7a45 100644 --- a/rules/docker_config.bzl +++ b/rules/docker_config.bzl
@@ -250,7 +250,7 @@ remove_repo_cmd = "cd ." if ctx.attr.repo_pkg_tar: repo_pkg_tar = str(ctx.attr.repo_pkg_tar.label.name) - package_name = _EXTERNAL_FOLDER_PREFIX + _WORKSPACE_NAME + "/" + str(ctx.attr.repo_pkg_tar.label.package) + package_name = str(ctx.attr.repo_pkg_tar.label.package) # Expand the tar file pointed by repo_pkg_tar expand_repo_cmd = ("mkdir ./%s ; tar -xf %s/%s.tar -C ./%s" %
diff --git a/test/configs/BUILD b/test/configs/BUILD index 2a7d3e2..526e049 100644 --- a/test/configs/BUILD +++ b/test/configs/BUILD
@@ -59,7 +59,7 @@ docker_toolchain_autoconfig( name = "debian-jessie-custom-bazel-version-autoconfig", base = ":rbe-test-jessie-with-pkgs.tar", - bazel_version = "0.13.0", + bazel_version = "0.16.0", env = gcc_env(), tags = ["manual"], test = True, @@ -70,7 +70,7 @@ name = "debian-jessie-custom-bazel-rc-version-autoconfig", base = ":rbe-test-jessie-with-pkgs.tar", bazel_rc_version = "1", - bazel_version = "0.13.0", + bazel_version = "0.16.0", env = gcc_env(), tags = ["manual"], test = True, @@ -119,7 +119,7 @@ docker_toolchain_autoconfig( name = "ubuntu-xenial-custom-bazel-version-autoconfig", base = ":rbe-test-xenial-with-pkgs.tar", - bazel_version = "0.13.0", + bazel_version = "0.16.0", env = gcc_env(), tags = ["manual"], test = True, @@ -130,7 +130,7 @@ name = "ubuntu-xenial-custom-bazel-rc-version-autoconfig", base = ":rbe-test-xenial-with-pkgs.tar", bazel_rc_version = "1", - bazel_version = "0.13.0", + bazel_version = "0.16.0", env = gcc_env(), tags = ["manual"], test = True,