Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Docs ci switch jk to bk #2898

Merged
merged 5 commits into from
Feb 8, 2024
Merged

Docs ci switch jk to bk #2898

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
4840736
Update air-gapped registry path
nkammah Jan 18, 2024
8bef21e
Switch to using master and drop the _bk_ prefix for Buildkite builds
nkammah Jan 18, 2024
d2ed77a
update GH action to drop Jenkins references
nkammah Jan 18, 2024
7abf626
Remove secrets fetching that are no longer needed since we're using PAT
nkammah Feb 6, 2024
9c33395
Maintain the _bk_ in the Buildkite PRs - this is less confusing
nkammah Feb 7, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .buildkite/air_gapped_pipeline.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
8 changes: 0 additions & 8 deletions .buildkite/build_pipeline.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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: "docs-status@elastic.co"
if: build.state == "failed"
8 changes: 0 additions & 8 deletions .buildkite/build_pr_pipeline.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,11 +27,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
3 changes: 0 additions & 3 deletions .buildkite/hooks/pre-command
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,14 +27,11 @@ export BUILD_MACHINE_TYPE="n2-standard-4"
# Secrets must be redacted
# https://buildkite.com/docs/pipelines/managing-log-output#redacted-environment-variables
if [[ "$BUILDKITE_PIPELINE_SLUG" == "docs-build-pr" ]];then
export GITHUB_TOKEN=$(retry 5 vault kv get -field=value secret/ci/elastic-docs/docs_preview_cleaner)
export BUILDKITE_API_TOKEN=$(retry 5 vault kv get -field=value secret/ci/elastic-docs/buildkite_token)
if [[ ${GITHUB_PR_BASE_REPO:="unset"} == "docs" ]]; then
# Docs PR require a full rebuild - so let's boost the builds so they don't take 2 hours
export BUILD_MACHINE_TYPE="n2-highcpu-32"
fi
elif [[ "$BUILDKITE_PIPELINE_SLUG" == "docs-preview-cleaner" ]];then
export GITHUB_TOKEN=$(retry 5 vault kv get -field=value secret/ci/elastic-docs/docs_preview_cleaner)
elif [[ "$BUILDKITE_PIPELINE_SLUG" == "docs-build" ]];then
export BUILD_MACHINE_TYPE="n2-highcpu-32"
fi
3 changes: 1 addition & 2 deletions .buildkite/scripts/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
81 changes: 0 additions & 81 deletions .buildkite/scripts/compare_bk_jenkins_branches.sh
View file
Open in desktop

This file was deleted.

8 changes: 2 additions & 6 deletions .github/actions/docs-preview/action.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,14 +28,10 @@ runs:
const { REPO, PR, PREVIEW_PATH } = process.env

const comment = `A documentation preview will be available soon.<br>
Help us out by validating the Buildkite preview and reporting issues [here](https://github.com/elastic/docs/issues/new?labels=buildkite-migration,bug).
Please also be sure to **double check all images to ensure they are correct** in the preview.

- 🔨 Buildkite [builds](https://buildkite.com/elastic/docs-build-pr/builds?meta_data[repo_pr]=${REPO}_${PR})
- 📚 HTML diff: [Buildkite](https://${REPO}_bk_${PR}.docs-preview.app.elstc.co/diff) - [Jenkins](https://${REPO}_${PR}.docs-preview.app.elstc.co/diff)
- 📙 Preview: [Buildkite](https://${REPO}_bk_${PR}.docs-preview.app.elstc.co/${PREVIEW_PATH}) - [Jenkins](https://${REPO}_${PR}.docs-preview.app.elstc.co/${PREVIEW_PATH})
- 🧪 [Buildkite vs Jenkins diff](https://github.com/elastic/built-docs/compare/${REPO}_bk_${PR}..${REPO}_${PR})

- 📚 HTML [diff](https://${REPO}_bk_${PR}.docs-preview.app.elstc.co/diff)
- 📙 Preview [page](https://${REPO}_bk_${PR}.docs-preview.app.elstc.co/${PREVIEW_PATH})

<details>
<summary>Request a new doc build by commenting</summary>
Expand Down
2 changes: 1 addition & 1 deletion air_gapped/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

set -eo pipefail

export AIR_GAPPED=docker.elastic.co/docs-private/air_gapped:latest
export AIR_GAPPED=docker.elastic.co/docs-private/bk_air_gapped:latest
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this change correct for air gapped?


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

Expand Down