Migrate bazel-tests-remote.json to bazelbuild/bazel
Change-Id: I7ac93b4901c68247bd55ad7fb2d1017fed7f9c71
diff --git a/jenkins/jobs/BUILD b/jenkins/jobs/BUILD
index 8dc89b9..ce1e8a1 100644
--- a/jenkins/jobs/BUILD
+++ b/jenkins/jobs/BUILD
@@ -95,11 +95,12 @@
bazel_github_job(
name = "bazel-tests-remote",
- config = ":configs/bazel-tests-remote.json",
+ config = ":configs/empty.json",
gerrit_project = "bazel",
git_url = "https://bazel.googlesource.com/bazel",
pr_enabled = False, # Do not vet PR because it seems to cancel bazel-tests.
project = "bazel",
+ use_upstream_branch = True,
)
bazel_github_job(
diff --git a/jenkins/jobs/configs/bazel-tests-remote.json b/jenkins/jobs/configs/bazel-tests-remote.json
deleted file mode 100644
index bed2380..0000000
--- a/jenkins/jobs/configs/bazel-tests-remote.json
+++ /dev/null
@@ -1,36 +0,0 @@
-[
- {
- "configurations": [
- {"node": "ubuntu_16.04-x86_64"}
- ],
- "parameters": {
- "startup_opts": [
- "--host_jvm_args=-Dbazel.DigestFunction=SHA1"
- ],
- "build_opts": [
- "--remote_cache=remotebuildexecution.googleapis.com",
- "--remote_executor=remotebuildexecution.googleapis.com",
- "--remote_instance_name=projects/bazel-public",
- "--spawn_strategy=remote",
- "--remote_timeout=3600",
- "--strategy=Javac=remote",
- "--strategy=Closure=remote",
- "--genrule_strategy=remote",
- "--auth_enabled=true",
- "--tls_enabled=true",
- "--jobs=75",
- "--experimental_strict_action_env=true",
- "--experimental_remote_platform_override='properties:{ name:\"container-image\" value:\"docker://gcr.io/asci-toolchain/nosla-debian8-clang-fl@sha256:b278413694b899d381dc1b8c64df57b6d2314c8b9906aa1ea6f9b9ec924ad644\" }'",
- "--crosstool_top=@bazel_toolchains//configs/debian8_clang/0.1.0/bazel_0.5.4:toolchain",
- "--host_java_toolchain=@bazel_toolchains//configs/java/0.1.0/bazel_0.5.4:remote_toolchain",
- "--java_toolchain=@bazel_toolchains//configs/java/0.1.0/bazel_0.5.4:remote_toolchain"
- ],
- "tests": [
- "//src/test/shell/integration/...",
- "//src/test/java/... - //src/test/java/com/google/devtools/build/android/..."
- ],
- "test_tag_filters": ["-slow"],
- "targets": [],
- },
- }
-]
