Skip to content

Commit 1c14c67

Browse files
authored
Use .bazelci/build_bazel_binaries.yml for downstream pipelines (#1526)
In downstream pipelines, we need to build and upload Bazel binaries at HEAD before testing downstream projects with it. Previously, we were generating the "Build Bazel" steps for each supported platform from the postsubmit.yml config. This was broken by bazelbuild/bazel@3f93e7b, because now there are multiple jobs for the same platform. See https://buildkite.com/bazel/bazel-at-head-plus-downstream/builds/2815 This PR switches all downstream pipelines to use build_bazel_binaries.yml config, which has the minimal steps for each platform and builds both bazel and bazel_nojdk binaries.
1 parent b62343d commit 1c14c67

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

buildkite/terraform/bazel-testing/main.tf

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -175,15 +175,15 @@ resource "buildkite_pipeline" "bazelisk-plus-incompatible-flags" {
175175
resource "buildkite_pipeline" "bazel-at-head-plus-disabled" {
176176
name = "Bazel@HEAD + Disabled"
177177
repository = "https://github.com/bazelbuild/bazel.git"
178-
steps = templatefile("pipeline.yml.tpl", { envs = {}, steps = { commands = ["curl -sS \"https://raw.githubusercontent.com/bazelbuild/continuous-integration/testing/buildkite/bazelci.py?$(date +%s)\" -o bazelci.py", "python3.6 bazelci.py bazel_downstream_pipeline --http_config=https://raw.githubusercontent.com/bazelbuild/bazel/master/.bazelci/presubmit.yml --test_disabled_projects | tee /dev/tty | buildkite-agent pipeline upload"] } })
178+
steps = templatefile("pipeline.yml.tpl", { envs = {}, steps = { commands = ["curl -sS \"https://raw.githubusercontent.com/bazelbuild/continuous-integration/testing/buildkite/bazelci.py?$(date +%s)\" -o bazelci.py", "python3.6 bazelci.py bazel_downstream_pipeline --file_config=.bazelci/build_bazel_binaries.yml --test_disabled_projects | tee /dev/tty | buildkite-agent pipeline upload"] } })
179179
description = "Test disabled downstream projects to see if they are already fixed."
180180
default_branch = "master"
181181
}
182182

183183
resource "buildkite_pipeline" "bazel-at-head-plus-downstream" {
184184
name = "Bazel@HEAD + Downstream"
185185
repository = "https://github.com/bazelbuild/bazel.git"
186-
steps = templatefile("pipeline.yml.tpl", { envs = {}, steps = { commands = ["curl -sS \"https://raw.githubusercontent.com/bazelbuild/continuous-integration/testing/buildkite/bazelci.py?$(date +%s)\" -o bazelci.py", "python3.6 bazelci.py bazel_downstream_pipeline --http_config=https://raw.githubusercontent.com/bazelbuild/bazel/master/.bazelci/presubmit.yml | tee /dev/tty | buildkite-agent pipeline upload"] } })
186+
steps = templatefile("pipeline.yml.tpl", { envs = {}, steps = { commands = ["curl -sS \"https://raw.githubusercontent.com/bazelbuild/continuous-integration/testing/buildkite/bazelci.py?$(date +%s)\" -o bazelci.py", "python3.6 bazelci.py bazel_downstream_pipeline --file_config=.bazelci/build_bazel_binaries.yml | tee /dev/tty | buildkite-agent pipeline upload"] } })
187187
description = "Test Bazel@HEAD + downstream projects@last_green_commit"
188188
default_branch = "master"
189189
}

buildkite/terraform/bazel/main.tf

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1095,7 +1095,7 @@ resource "buildkite_pipeline" "rules-swift-swift" {
10951095
resource "buildkite_pipeline" "bazel-at-head-plus-disabled" {
10961096
name = "Bazel@HEAD + Disabled"
10971097
repository = "https://github.com/bazelbuild/bazel.git"
1098-
steps = templatefile("pipeline.yml.tpl", { envs = {}, steps = { commands = ["curl -sS \"https://raw.githubusercontent.com/bazelbuild/continuous-integration/master/buildkite/bazelci.py?$(date +%s)\" -o bazelci.py", "python3.6 bazelci.py bazel_downstream_pipeline --http_config=https://raw.githubusercontent.com/bazelbuild/bazel/master/.bazelci/presubmit.yml --test_disabled_projects | tee /dev/tty | buildkite-agent pipeline upload"] } })
1098+
steps = templatefile("pipeline.yml.tpl", { envs = {}, steps = { commands = ["curl -sS \"https://raw.githubusercontent.com/bazelbuild/continuous-integration/master/buildkite/bazelci.py?$(date +%s)\" -o bazelci.py", "python3.6 bazelci.py bazel_downstream_pipeline --file_config=.bazelci/build_bazel_binaries.yml --test_disabled_projects | tee /dev/tty | buildkite-agent pipeline upload"] } })
10991099
description = "Test disabled downstream projects to see if they are already fixed."
11001100
default_branch = "master"
11011101
team = [{ access_level = "MANAGE_BUILD_AND_READ", slug = "bazel-sheriffs" }, { access_level = "BUILD_AND_READ", slug = "downstream-pipeline-triggerers" }, { access_level = "READ_ONLY", slug = "bazel" }]
@@ -1673,7 +1673,7 @@ resource "buildkite_pipeline" "tensorflow" {
16731673
resource "buildkite_pipeline" "bazel-at-head-plus-downstream" {
16741674
name = "Bazel@HEAD + Downstream"
16751675
repository = "https://github.com/bazelbuild/bazel.git"
1676-
steps = templatefile("pipeline.yml.tpl", { envs = {}, steps = { commands = ["curl -sS \"https://raw.githubusercontent.com/bazelbuild/continuous-integration/master/buildkite/bazelci.py?$(date +%s)\" -o bazelci.py", "python3.6 bazelci.py bazel_downstream_pipeline --file_config=.bazelci/postsubmit.yml | tee /dev/tty | buildkite-agent pipeline upload"] } })
1676+
steps = templatefile("pipeline.yml.tpl", { envs = {}, steps = { commands = ["curl -sS \"https://raw.githubusercontent.com/bazelbuild/continuous-integration/master/buildkite/bazelci.py?$(date +%s)\" -o bazelci.py", "python3.6 bazelci.py bazel_downstream_pipeline --file_config=.bazelci/build_bazel_binaries.yml | tee /dev/tty | buildkite-agent pipeline upload"] } })
16771677
description = "Test Bazel@HEAD + downstream projects@last_green_commit"
16781678
default_branch = "master"
16791679
team = [{ access_level = "MANAGE_BUILD_AND_READ", slug = "bazel-sheriffs" }, { access_level = "BUILD_AND_READ", slug = "downstream-pipeline-triggerers" }, { access_level = "BUILD_AND_READ", slug = "bazel" }]

0 commit comments

Comments
 (0)