From b6501db3db1e04f8a249c1c2504da458908474b5 Mon Sep 17 00:00:00 2001 From: Florian Weikert Date: Wed, 24 Apr 2019 18:24:11 +0200 Subject: [PATCH 1/2] Test validate_config option. --- buildkite/pipelines/bazel-remote-execution-postsubmit.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/buildkite/pipelines/bazel-remote-execution-postsubmit.yml b/buildkite/pipelines/bazel-remote-execution-postsubmit.yml index 5611a0ce17..9c90d7f251 100644 --- a/buildkite/pipelines/bazel-remote-execution-postsubmit.yml +++ b/buildkite/pipelines/bazel-remote-execution-postsubmit.yml @@ -1,4 +1,5 @@ --- +validate_config: True platforms: ubuntu1604: shell_commands: From 2e8db145a0f00a1efe20df4117641970e81ed276 Mon Sep 17 00:00:00 2001 From: Florian Weikert Date: Tue, 7 May 2019 16:15:29 +0200 Subject: [PATCH 2/2] Enable sharding for correct platform --- .../bazel-remote-execution-postsubmit.yml | 73 ++++--------------- 1 file changed, 14 insertions(+), 59 deletions(-) diff --git a/buildkite/pipelines/bazel-remote-execution-postsubmit.yml b/buildkite/pipelines/bazel-remote-execution-postsubmit.yml index 9c90d7f251..154eb4a894 100644 --- a/buildkite/pipelines/bazel-remote-execution-postsubmit.yml +++ b/buildkite/pipelines/bazel-remote-execution-postsubmit.yml @@ -1,82 +1,37 @@ --- -validate_config: True platforms: - ubuntu1604: + ubuntu1804: + shards: 10 shell_commands: - sed -i.bak -e 's/^# android_sdk_repository/android_sdk_repository/' -e 's/^# android_ndk_repository/android_ndk_repository/' WORKSPACE - rm -f WORKSPACE.bak - build_flags: - - "--host_javabase=@bazel_toolchains//configs/ubuntu16_04_clang/1.2:jdk8" - - "--javabase=@bazel_toolchains//configs/ubuntu16_04_clang/1.2:jdk8" - - "--host_java_toolchain=@bazel_tools//tools/jdk:toolchain_hostjdk8" - - "--java_toolchain=@bazel_tools//tools/jdk:toolchain_hostjdk8" - - "--crosstool_top=@bazel_toolchains//configs/ubuntu16_04_clang/1.2/bazel_0.24.0/default:toolchain" - - "--extra_toolchains=@bazel_toolchains//configs/ubuntu16_04_clang/1.2/bazel_0.24.0/cpp:cc-toolchain-clang-x86_64-default" - - "--extra_execution_platforms=//:rbe_ubuntu1604_default" - - "--extra_execution_platforms=//:rbe_ubuntu1604_highcpu" - - "--host_platform=//:rbe_ubuntu1604_default" - - "--platforms=//:rbe_ubuntu1604_default" - - "--spawn_strategy=remote" - - "--strategy=Javac=remote" - - "--strategy=Closure=remote" - - "--strategy=Genrule=remote" - - "--define=EXECUTOR=remote" - - "--remote_cache=remotebuildexecution.googleapis.com" - - "--remote_executor=remotebuildexecution.googleapis.com" - - "--tls_enabled=true" - - "--action_env=PATH=/bin:/usr/bin:/usr/local/bin" - - "--remote_timeout=1200" - - "--jobs=100" - - "--google_default_credentials" - - "--remote_instance_name=projects/bazel-untrusted/instances/default_instance" - build_targets: - - "//src:bazel" - - "//src:bazel_jdk_minimal" test_flags: - - "--host_javabase=@bazel_toolchains//configs/ubuntu16_04_clang/1.2:jdk8" - - "--javabase=@bazel_toolchains//configs/ubuntu16_04_clang/1.2:jdk8" - - "--host_java_toolchain=@bazel_tools//tools/jdk:toolchain_hostjdk8" - - "--java_toolchain=@bazel_tools//tools/jdk:toolchain_hostjdk8" - - "--crosstool_top=@bazel_toolchains//configs/ubuntu16_04_clang/1.2/bazel_0.24.0/default:toolchain" - - "--extra_toolchains=@bazel_toolchains//configs/ubuntu16_04_clang/1.2/bazel_0.24.0/cpp:cc-toolchain-clang-x86_64-default" - - "--extra_execution_platforms=//:rbe_ubuntu1604_default" - - "--extra_execution_platforms=//:rbe_ubuntu1604_highcpu" - - "--host_platform=//:rbe_ubuntu1604_default" - - "--platforms=//:rbe_ubuntu1604_default" - - "--spawn_strategy=remote" - - "--strategy=Javac=remote" - - "--strategy=Closure=remote" - - "--strategy=Genrule=remote" - - "--define=EXECUTOR=remote" - - "--remote_cache=remotebuildexecution.googleapis.com" + - "--config=remote" - "--remote_executor=remotebuildexecution.googleapis.com" - - "--tls_enabled=true" - - "--action_env=PATH=/bin:/usr/bin:/usr/local/bin" - - "--remote_timeout=1200" - - "--jobs=100" - - "--google_default_credentials" - - "--remote_instance_name=projects/bazel-untrusted/instances/default_instance" - - "--test_timeout=1200" + - "--jobs=200" + - "--experimental_remote_download_outputs=minimal" + - "--experimental_inmemory_jdeps_files" + - "--experimental_inmemory_dotd_files" test_targets: - "--" + - "//scripts/..." + - "//src/java_tools/..." - "//src/test/..." - "//src/tools/execlog/..." - "//src/tools/singlejar/..." - "//src/tools/workspacelog/..." - "//third_party/ijar/..." - "//tools/aquery_differ/..." + - "//tools/python/..." + - "//tools/android/..." # See https://github.com/bazelbuild/bazel/issues/8033 - - "-//src/test/java/com/google/devtools/build/android/..." - - "-//tools/android/..." - - "-//src/test/shell/bazel/android/..." - "-//src/tools/singlejar:output_jar_simple_test" - - "-//src/test/shell/bazel:bazel_coverage_java_test" - - "-//src/test/shell/bazel:bazel_cc_code_coverage_test" - "-//src/test/shell/bazel:external_integration_test" - "-//src/test/shell/bazel:maven_test" - "-//src/test/shell/bazel:bazel_repository_cache_test" - - "-//src/test/shell/bazel:bazel_sandboxing_cpp_test" - "-//src/test/shell/integration:java_integration_test" - - "-//scripts/..." - "-//src/test/java/com/google/devtools/build/lib:sandbox-tests" + # See https://github.com/bazelbuild/bazel/issues/8162 (also disabled for local exec) + - "-//src/java_tools/buildjar/..." + - "-//src/java_tools/import_deps_checker/..."