From 5cd4e7a45a2e8693e51d920dbc286791083d1c27 Mon Sep 17 00:00:00 2001 From: nassimkammah Date: Wed, 13 Dec 2023 06:40:02 +0100 Subject: [PATCH] Set metadata --- .buildkite/build_pr_pipeline.yml | 52 +++++++++---------- .../scripts/compare_bk_jenkins_branches.sh | 3 +- 2 files changed, 28 insertions(+), 27 deletions(-) diff --git a/.buildkite/build_pr_pipeline.yml b/.buildkite/build_pr_pipeline.yml index e62ca5c509ab7..1cc5abf86dfa0 100644 --- a/.buildkite/build_pr_pipeline.yml +++ b/.buildkite/build_pr_pipeline.yml @@ -1,30 +1,30 @@ steps: - - key: "cancel-existing-builds" - command: ".buildkite/scripts/cancel_running_pr.sh || true" - - key: "build-pr-setup" - label: "setup" - command: ".buildkite/scripts/build_pr_commit_status.sh pending" - - key: "build-pr" - label: ":hammer: Build docs PR" - command: ".buildkite/scripts/build_pr.sh" - depends_on: - - step: build-pr-setup - allow_failure: true - agents: - provider: "gcp" - image: family/docs-ubuntu-2204 - machineType: ${BUILD_PR_MACHINE_TYPE} - - key: "teardown" - label: "teardown" - command: | - if [ $(buildkite-agent step get "outcome" --step "build-pr") == "passed" ]; then - .buildkite/scripts/build_pr_commit_status.sh success - else - .buildkite/scripts/build_pr_commit_status.sh failure - fi - depends_on: - - step: "build-pr" - - wait + # - key: "cancel-existing-builds" + # command: ".buildkite/scripts/cancel_running_pr.sh || true" + # - key: "build-pr-setup" + # label: "setup" + # command: ".buildkite/scripts/build_pr_commit_status.sh pending" + # - key: "build-pr" + # label: ":hammer: Build docs PR" + # command: ".buildkite/scripts/build_pr.sh" + # depends_on: + # - step: build-pr-setup + # allow_failure: true + # agents: + # provider: "gcp" + # image: family/docs-ubuntu-2204 + # machineType: ${BUILD_PR_MACHINE_TYPE} + # - key: "teardown" + # label: "teardown" + # command: | + # if [ $(buildkite-agent step get "outcome" --step "build-pr") == "passed" ]; then + # .buildkite/scripts/build_pr_commit_status.sh success + # else + # .buildkite/scripts/build_pr_commit_status.sh failure + # fi + # depends_on: + # - step: "build-pr" + # - wait - key: "branch-comparison" label: "Compare branches" command: | diff --git a/.buildkite/scripts/compare_bk_jenkins_branches.sh b/.buildkite/scripts/compare_bk_jenkins_branches.sh index 0b24d15a0f558..1c9c532ae9995 100755 --- a/.buildkite/scripts/compare_bk_jenkins_branches.sh +++ b/.buildkite/scripts/compare_bk_jenkins_branches.sh @@ -2,7 +2,8 @@ BUILDKITE_BRANCH=$1 JENKINS_BRANCH=$2 - +buildkite-agent meta-data set "bk-jenkins-branch-comparison" "identical" +exit 2 if [ -z ${BUILDKITE_BRANCH} ] || [ -z ${JENKINS_BRANCH} ];then echo "Missing BUILDKITE_BRANCH or JENKINS_BRANCH - aborting" exit 1