Switch to using master and drop the _bk_ prefix for Buildkite builds

elastic · Jan 18, 2024 · 5a77790 · 5a77790
1 parent 21af060
commit 5a77790
Show file tree

Hide file tree

Showing 6 changed files with 3 additions and 101 deletions.
diff --git a/.buildkite/air_gapped_pipeline.yml b/.buildkite/air_gapped_pipeline.yml
@@ -2,7 +2,7 @@ steps:
   - label: ":white_check_mark: Build air-gapped"
     command: ".buildkite/scripts/publish_air_gapped_docs.sh"
     env:
-      AIR_GAPPED: "docker.elastic.co/docs-private/bk_air_gapped:latest"
+      AIR_GAPPED: "docker.elastic.co/docs-private/air_gapped:latest"
     agents:
       provider: "gcp"
       image: family/docs-ubuntu-2204
diff --git a/.buildkite/build_pipeline.yml b/.buildkite/build_pipeline.yml
@@ -34,14 +34,6 @@ steps:
       provider: "gcp"
       image: family/docs-ubuntu-2204
       machineType: ${BUILD_MACHINE_TYPE}
-  - wait
-  - key: "branch-comparison"
-    label: "Compare branches"
-    command: |
-      .buildkite/scripts/compare_bk_jenkins_branches.sh staging master
-    agents:
-      provider: "gcp"
-      image: family/docs-ubuntu-2204
 notify:
   - email: "[email protected]"
     if: build.state == "failed"
diff --git a/.buildkite/build_pr_pipeline.yml b/.buildkite/build_pr_pipeline.yml
@@ -24,11 +24,3 @@ steps:
       fi
     depends_on:
       - step: "build-pr"
-  - wait
-  - key: "branch-comparison"
-    label: "Compare branches"
-    command: |
-      .buildkite/scripts/compare_bk_jenkins_branches.sh ${GITHUB_PR_BASE_REPO}_bk_${GITHUB_PR_NUMBER} ${GITHUB_PR_BASE_REPO}_${GITHUB_PR_NUMBER}
-    agents:
-      provider: "gcp"
-      image: family/docs-ubuntu-2204
diff --git a/.buildkite/scripts/build.sh b/.buildkite/scripts/build.sh
@@ -25,8 +25,7 @@ elif [[ "${BROKEN_LINKS}" == 'warnlinkcheck' ]]; then
 fi
 
 if [[ "${BUILDKITE_BRANCH}" == "master" ]]; then
-  # temporary pushing to staging instead of master until the migration is over
-  build_args+=" --target_branch staging --push"
+  build_args+=" --push"
 fi
 
 # The docs build can use the ssh agent's authentication socket

diff --git a/.buildkite/scripts/build_pr.sh b/.buildkite/scripts/build_pr.sh
@@ -70,7 +70,7 @@ fi
 
 
 # Set the target branch and preview options
-TARGET_BRANCH="${GITHUB_PR_BASE_REPO}_bk_${GITHUB_PR_NUMBER}"
+TARGET_BRANCH="${GITHUB_PR_BASE_REPO}_${GITHUB_PR_NUMBER}"
 PREVIEW_URL="https://${TARGET_BRANCH}.docs-preview.app.elstc.co"
 
 build_cmd="./build_docs --all \

diff --git a/.buildkite/scripts/compare_bk_jenkins_branches.sh b/.buildkite/scripts/compare_bk_jenkins_branches.sh