From 514418951d1a7de693988c92814f832691557107 Mon Sep 17 00:00:00 2001 From: favilo Date: Thu, 19 Sep 2024 16:56:04 -0700 Subject: [PATCH] feat: allow us to dev-build the `master` branch from a different pipeline branch --- .buildkite/dev-docker/pipeline.yml | 3 +++ .buildkite/dev-docker/run.sh | 7 ++++++- docker/Dockerfiles/release/Dockerfile | 3 --- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/.buildkite/dev-docker/pipeline.yml b/.buildkite/dev-docker/pipeline.yml index e1c7b8a1d..b9c49e016 100644 --- a/.buildkite/dev-docker/pipeline.yml +++ b/.buildkite/dev-docker/pipeline.yml @@ -38,3 +38,6 @@ steps: depends_on: - "amd64" - "arm64" + agents: + zone: "us-central1-a" + provider: "gcp" diff --git a/.buildkite/dev-docker/run.sh b/.buildkite/dev-docker/run.sh index 8f8d4b9b5..c71cfdbbf 100644 --- a/.buildkite/dev-docker/run.sh +++ b/.buildkite/dev-docker/run.sh @@ -25,7 +25,12 @@ tmp_dir=$(mktemp --directory) pushd "$tmp_dir" git clone https://github.com/elastic/rally pushd rally -git checkout "${BUILD_FROM_BRANCH}" +# checkout the version from the buildkite branch, but build it from the branch we specified +if [[ ! -z "${BUILDKITE_BRANCH}" ]]; then + git checkout "${BUILDKITE_BRANCH}" +else + git checkout "${BUILD_FROM_BRANCH}" +fi git --no-pager show set -x diff --git a/docker/Dockerfiles/release/Dockerfile b/docker/Dockerfiles/release/Dockerfile index 0beae0a87..ff6be8f1c 100644 --- a/docker/Dockerfiles/release/Dockerfile +++ b/docker/Dockerfiles/release/Dockerfile @@ -44,9 +44,6 @@ RUN mkdir -p /rally/.rally && \ USER 1000 -RUN python3 -m pip install --user --upgrade hatch hatchling pip wheel -RUN python3 -m pip install --user esrally==$RALLY_VERSION - RUN python3 -m venv /rally/venv ENV PATH=/rally/venv/bin:$PATH