Remove unnecessary tests.
- removed Trusty based tests.
- removed tests to generate toolchain configs that we no longer support.
Change-Id: I042ee272a3592fa81cf0761a04073f8ec967f2f2
diff --git a/WORKSPACE b/WORKSPACE
index f73667b..48b6657 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -57,13 +57,6 @@
)
container_pull(
- name = "official_trusty",
- registry = "index.docker.io",
- repository = "library/ubuntu",
- tag = "14.04",
-)
-
-container_pull(
name = "official_xenial",
registry = "index.docker.io",
repository = "library/ubuntu",
@@ -96,12 +89,6 @@
url = "https://bazel.build/bazel-release.pub.gpg",
)
-http_file(
- name = "launchpad_openjdk_gpg",
- sha256 = "54b6274820df34a936ccc6f5cb725a9b7bb46075db7faf0ef7e2d86452fa09fd",
- url = "http://keyserver.ubuntu.com/pks/lookup?op=get&fingerprint=on&search=0xEB9B1D8886F44E2A",
-)
-
# Use http_archive rule instead of git_repository rule
# https://docs.bazel.build/versions/master/be/workspace.html#git_repository
http_archive(
diff --git a/rules/BUILD b/rules/BUILD
index 2201f86..35ad9f3 100644
--- a/rules/BUILD
+++ b/rules/BUILD
@@ -66,7 +66,7 @@
keys = DEBIAN8_CLANG_DEFAULT_KEYS,
packages = DEBIAN8_CLANG_DEFAULT_PACKAGES,
tags = ["manual"],
- test = True,
+ test = False,
)
# Created on 2017.11.28
@@ -79,7 +79,7 @@
keys = DEBIAN8_CLANG_DEFAULT_KEYS,
packages = DEBIAN8_CLANG_DEFAULT_PACKAGES,
tags = ["manual"],
- test = True,
+ test = False,
)
# Created on 2018.01.10
@@ -107,7 +107,7 @@
keys = DEBIAN8_CLANG_DEFAULT_KEYS,
packages = DEBIAN8_CLANG_DEFAULT_PACKAGES,
tags = ["manual"],
- test = True,
+ test = False,
)
# Created on 2018.02.13
diff --git a/scripts/ci/bazel-toolchains.json b/scripts/ci/bazel-toolchains.json
index 386a464..0d4dd0b 100644
--- a/scripts/ci/bazel-toolchains.json
+++ b/scripts/ci/bazel-toolchains.json
@@ -12,19 +12,12 @@
"//test:debian-jessie-bazel-head-autoconfig_test",
"//test:debian-jessie-custom-bazel-version-autoconfig_test",
"//test:debian-jessie-custom-bazel-rc-version-autoconfig_test",
- "//test:ubuntu-trusty-autoconfig_test",
- "//test:ubuntu-trusty-bazel-head-autoconfig_test",
- "//test:ubuntu-trusty-custom-bazel-version-autoconfig_test",
- "//test:ubuntu-trusty-custom-bazel-rc-version-autoconfig_test",
"//test:ubuntu-xenial-autoconfig_test",
"//test:ubuntu-xenial-bazel-head-autoconfig_test",
"//test:ubuntu-xenial-custom-bazel-version-autoconfig_test",
"//test:ubuntu-xenial-custom-bazel-rc-version-autoconfig_test",
"//test:debian8_clang_autoconfig_test",
- "//rules:debian8-clang-0.2.0-bazel_0.7.0-autoconfig_test",
- "//rules:debian8-clang-0.2.0-bazel_0.8.0-autoconfig_test",
"//rules:debian8-clang-0.2.0-bazel_0.9.0-autoconfig_test",
- "//rules:debian8-clang-0.2.0-bazel_0.10.0-autoconfig_test",
"//rules:debian8-clang-0.3.0-bazel_0.10.0-autoconfig_test"
],
}
diff --git a/test/BUILD b/test/BUILD
index 604c914..c2b2ece 100644
--- a/test/BUILD
+++ b/test/BUILD
@@ -84,67 +84,6 @@
)
container_install_pkgs(
- name = "trusty-with-pkgs",
- base = "@official_trusty//image",
- packages = [
- "bazel",
- "curl",
- "gcc",
- "git",
- "openjdk-8-jdk",
- "python-dev",
- "unzip",
- "wget",
- "zip",
- ],
- additional_repos = [
- "deb [arch=amd64] http://ppa.launchpad.net/openjdk-r/ppa/ubuntu/ trusty main",
- "deb [arch=amd64] http://storage.googleapis.com/bazel-apt stable jdk1.8",
- ],
- keys = [
- "@launchpad_openjdk_gpg//file",
- "@bazel_gpg//file",
- ],
-)
-
-docker_toolchain_autoconfig(
- name = "ubuntu-trusty-autoconfig",
- base = ":trusty-with-pkgs.tar",
- env = gcc_env(),
- tags = ["manual"],
- test = True,
-)
-
-docker_toolchain_autoconfig(
- name = "ubuntu-trusty-bazel-head-autoconfig",
- base = ":trusty-with-pkgs.tar",
- env = gcc_env(),
- tags = ["manual"],
- use_bazel_head = True,
- test = True,
-)
-
-docker_toolchain_autoconfig(
- name = "ubuntu-trusty-custom-bazel-version-autoconfig",
- base = ":trusty-with-pkgs.tar",
- bazel_version = "0.9.0",
- env = gcc_env(),
- tags = ["manual"],
- test = True,
-)
-
-# Note that we only support Bazel rc versions at 0.10.0 or above.
-docker_toolchain_autoconfig(
- name = "ubuntu-trusty-custom-bazel-rc-version-autoconfig",
- base = ":trusty-with-pkgs.tar",
- bazel_version = "0.11.0",
- bazel_rc_version = "1",
- env = gcc_env(),
- tags = ["manual"],
- test = True,
-)
-
-container_install_pkgs(
name = "xenial-with-pkgs",
base = "@official_xenial//image",
packages = [
