Skip to content

Commit f54bd62

Browse files
authored
Docs ci switch jk to bk (#2898)
* Update air-gapped registry path * Switch to using master and drop the _bk_ prefix for Buildkite builds * update GH action to drop Jenkins references * Remove secrets fetching that are no longer needed since we're using PAT * Maintain the _bk_ in the Buildkite PRs - this is less confusing
1 parent bd6e9eb commit f54bd62

File tree

8 files changed

+5
-110
lines changed

8 files changed

+5
-110
lines changed

.buildkite/air_gapped_pipeline.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ steps:
33
label: ":white_check_mark: Build and publish air-gapped doc"
44
command: ".buildkite/scripts/publish_air_gapped_docs.sh"
55
env:
6-
AIR_GAPPED: "docker.elastic.co/docs-private/bk_air_gapped:latest"
6+
AIR_GAPPED: "docker.elastic.co/docs-private/air_gapped:latest"
77
agents:
88
provider: "gcp"
99
image: family/docs-ubuntu-2204

.buildkite/build_pipeline.yml

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -34,14 +34,6 @@ steps:
3434
provider: "gcp"
3535
image: family/docs-ubuntu-2204
3636
machineType: ${BUILD_MACHINE_TYPE}
37-
- wait
38-
- key: "branch-comparison"
39-
label: "Compare branches"
40-
command: |
41-
.buildkite/scripts/compare_bk_jenkins_branches.sh staging master
42-
agents:
43-
provider: "gcp"
44-
image: family/docs-ubuntu-2204
4537
notify:
4638
- email: "docs-status@elastic.co"
4739
if: build.state == "failed"

.buildkite/build_pr_pipeline.yml

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -27,11 +27,3 @@ steps:
2727
fi
2828
depends_on:
2929
- step: "build-pr"
30-
- wait
31-
- key: "branch-comparison"
32-
label: "Compare branches"
33-
command: |
34-
.buildkite/scripts/compare_bk_jenkins_branches.sh ${GITHUB_PR_BASE_REPO}_bk_${GITHUB_PR_NUMBER} ${GITHUB_PR_BASE_REPO}_${GITHUB_PR_NUMBER}
35-
agents:
36-
provider: "gcp"
37-
image: family/docs-ubuntu-2204

.buildkite/hooks/pre-command

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,14 +27,11 @@ export BUILD_MACHINE_TYPE="n2-standard-4"
2727
# Secrets must be redacted
2828
# https://buildkite.com/docs/pipelines/managing-log-output#redacted-environment-variables
2929
if [[ "$BUILDKITE_PIPELINE_SLUG" == "docs-build-pr" ]];then
30-
export GITHUB_TOKEN=$(retry 5 vault kv get -field=value secret/ci/elastic-docs/docs_preview_cleaner)
3130
export BUILDKITE_API_TOKEN=$(retry 5 vault kv get -field=value secret/ci/elastic-docs/buildkite_token)
3231
if [[ ${GITHUB_PR_BASE_REPO:="unset"} == "docs" ]]; then
3332
# Docs PR require a full rebuild - so let's boost the builds so they don't take 2 hours
3433
export BUILD_MACHINE_TYPE="n2-highcpu-32"
3534
fi
36-
elif [[ "$BUILDKITE_PIPELINE_SLUG" == "docs-preview-cleaner" ]];then
37-
export GITHUB_TOKEN=$(retry 5 vault kv get -field=value secret/ci/elastic-docs/docs_preview_cleaner)
3835
elif [[ "$BUILDKITE_PIPELINE_SLUG" == "docs-build" ]];then
3936
export BUILD_MACHINE_TYPE="n2-highcpu-32"
4037
elif [[ "$BUILDKITE_PIPELINE_SLUG" == "docs-build-air-gapped" ]] && [[ "$BUILDKITE_STEP_KEY" == "publish-air-gapped-doc" ]]; then

.buildkite/scripts/build.sh

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,7 @@ elif [[ "${BROKEN_LINKS}" == 'warnlinkcheck' ]]; then
2525
fi
2626

2727
if [[ "${BUILDKITE_BRANCH}" == "master" ]]; then
28-
# temporary pushing to staging instead of master until the migration is over
29-
build_args+=" --target_branch staging --push"
28+
build_args+=" --push"
3029
fi
3130

3231
# The docs build can use the ssh agent's authentication socket

.buildkite/scripts/compare_bk_jenkins_branches.sh

Lines changed: 0 additions & 81 deletions
This file was deleted.

.github/actions/docs-preview/action.yml

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -28,14 +28,10 @@ runs:
2828
const { REPO, PR, PREVIEW_PATH } = process.env
2929
3030
const comment = `A documentation preview will be available soon.<br>
31-
Help us out by validating the Buildkite preview and reporting issues [here](https://github.com/elastic/docs/issues/new?labels=buildkite-migration,bug).
32-
Please also be sure to **double check all images to ensure they are correct** in the preview.
3331
3432
- 🔨 Buildkite [builds](https://buildkite.com/elastic/docs-build-pr/builds?meta_data[repo_pr]=${REPO}_${PR})
35-
- 📚 HTML diff: [Buildkite](https://${REPO}_bk_${PR}.docs-preview.app.elstc.co/diff) - [Jenkins](https://${REPO}_${PR}.docs-preview.app.elstc.co/diff)
36-
- 📙 Preview: [Buildkite](https://${REPO}_bk_${PR}.docs-preview.app.elstc.co/${PREVIEW_PATH}) - [Jenkins](https://${REPO}_${PR}.docs-preview.app.elstc.co/${PREVIEW_PATH})
37-
- 🧪 [Buildkite vs Jenkins diff](https://github.com/elastic/built-docs/compare/${REPO}_bk_${PR}..${REPO}_${PR})
38-
33+
- 📚 HTML [diff](https://${REPO}_bk_${PR}.docs-preview.app.elstc.co/diff)
34+
- 📙 Preview [page](https://${REPO}_bk_${PR}.docs-preview.app.elstc.co/${PREVIEW_PATH})
3935
4036
<details>
4137
<summary>Request a new doc build by commenting</summary>

air_gapped/build.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
set -eo pipefail
66

7-
export AIR_GAPPED=docker.elastic.co/docs-private/air_gapped:latest
7+
export AIR_GAPPED=docker.elastic.co/docs-private/bk_air_gapped:latest
88

99
cd $(git rev-parse --show-toplevel)
1010

0 commit comments

Comments
 (0)