From 4c5ee07317dbd9fc00cdadbf8028dd3cc6141e07 Mon Sep 17 00:00:00 2001 From: Greg Thompson Date: Thu, 17 Feb 2022 11:25:48 -0600 Subject: [PATCH 1/4] Update upgrading-kibana.md --- wiki/upgrading-kibana.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wiki/upgrading-kibana.md b/wiki/upgrading-kibana.md index cbfd0c86031..cc2395dc8b7 100644 --- a/wiki/upgrading-kibana.md +++ b/wiki/upgrading-kibana.md @@ -16,7 +16,7 @@ If the upgrade includes a large number of commits or has known breaking changes, * Or run `yarn test:jest` locally 9. Resolve and commit reported issues (see [Resolving errors](#resolving-errors)) 10. Open a PR or mark existing as "Ready for review" (see [PR template](#pr-template)) - * Add the `EUI`, `auto-backport`, `release_note:skip`, and relevant version tags + * Add the `EUI`, `ci:deploy-cloud`, `release_note:skip`, and relevant version tag(s) (the next minor version that has not yet entered feature freeze) * Mention/ping any teams that are waiting on features to be available ## Resolving errors From 8306fa2dea4bfe675d389a89c193ae540ff9e325 Mon Sep 17 00:00:00 2001 From: Greg Thompson Date: Thu, 17 Feb 2022 11:41:16 -0600 Subject: [PATCH 2/4] deployment update --- wiki/releasing-versions.md | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/wiki/releasing-versions.md b/wiki/releasing-versions.md index 0db48144ff8..9a2ca218991 100644 --- a/wiki/releasing-versions.md +++ b/wiki/releasing-versions.md @@ -28,6 +28,15 @@ The latest changes have now been pushed to GitHub, a new `git` tag now exists on _\* GitHub Pages sites are cached aggressively and can sometimes take a couple of minutes to update._ +### Deploying to eui.elastic.co + +In addition to the GitHub pages deployment, we need to manually deploy to the [EUI Bekitzur environment](https://github.com/elastic/infra/tree/master/terraform/providers/gcp/env/elastic-bekitzur) (which will eventually be the canonical home of the EUI docs). + +* Go to [the Jenkins job page](https://kibana-ci.elastic.co/job/elastic+eui+deploy-docs/build) +* Log in (uses Elastic single sign in) +* Change the `branch_specifier` parameter to the new version tag name (e.g., `v48.0.0`) +* Click "Build" + ### Tag the release in GitHub We also update the [release's tag in github](https://github.com/elastic/eui/tags) by _creating a release_ for the version and copying over its _CHANGELOG.md_ entries. (TODO: screencast this next time to include a GIF here) From ba52aefcb25b3f76094002d70ca5870b461dc795 Mon Sep 17 00:00:00 2001 From: Greg Thompson Date: Thu, 17 Feb 2022 11:44:05 -0600 Subject: [PATCH 3/4] backport --- wiki/releasing-versions.md | 2 +- wiki/upgrading-kibana.md | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/wiki/releasing-versions.md b/wiki/releasing-versions.md index 9a2ca218991..903446558b0 100644 --- a/wiki/releasing-versions.md +++ b/wiki/releasing-versions.md @@ -33,7 +33,7 @@ The latest changes have now been pushed to GitHub, a new `git` tag now exists on In addition to the GitHub pages deployment, we need to manually deploy to the [EUI Bekitzur environment](https://github.com/elastic/infra/tree/master/terraform/providers/gcp/env/elastic-bekitzur) (which will eventually be the canonical home of the EUI docs). * Go to [the Jenkins job page](https://kibana-ci.elastic.co/job/elastic+eui+deploy-docs/build) -* Log in (uses Elastic single sign in) +* Log in (uses Elastic SSO) * Change the `branch_specifier` parameter to the new version tag name (e.g., `v48.0.0`) * Click "Build" diff --git a/wiki/upgrading-kibana.md b/wiki/upgrading-kibana.md index cc2395dc8b7..8f05254ddc1 100644 --- a/wiki/upgrading-kibana.md +++ b/wiki/upgrading-kibana.md @@ -17,6 +17,7 @@ If the upgrade includes a large number of commits or has known breaking changes, 9. Resolve and commit reported issues (see [Resolving errors](#resolving-errors)) 10. Open a PR or mark existing as "Ready for review" (see [PR template](#pr-template)) * Add the `EUI`, `ci:deploy-cloud`, `release_note:skip`, and relevant version tag(s) (the next minor version that has not yet entered feature freeze) + * We typically only merge into the main branch (the next minor version), but if an upgrade is specifically targeting a previous version, you can use the `auto-backport` tag to have Kibana automatically create a backport PR to an existing version branch. * Mention/ping any teams that are waiting on features to be available ## Resolving errors From 60cbdf3024cb0e203fc9810144cb32b62d3bf263 Mon Sep 17 00:00:00 2001 From: Greg Thompson Date: Thu, 17 Feb 2022 12:27:13 -0600 Subject: [PATCH 4/4] clean up --- wiki/releasing-versions.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wiki/releasing-versions.md b/wiki/releasing-versions.md index 903446558b0..aab3e1908a3 100644 --- a/wiki/releasing-versions.md +++ b/wiki/releasing-versions.md @@ -30,7 +30,7 @@ The latest changes have now been pushed to GitHub, a new `git` tag now exists on ### Deploying to eui.elastic.co -In addition to the GitHub pages deployment, we need to manually deploy to the [EUI Bekitzur environment](https://github.com/elastic/infra/tree/master/terraform/providers/gcp/env/elastic-bekitzur) (which will eventually be the canonical home of the EUI docs). +In addition to the GitHub pages deployment, we need to manually deploy to the EUI Bekitzur environment (which will eventually be the canonical home of the EUI docs). * Go to [the Jenkins job page](https://kibana-ci.elastic.co/job/elastic+eui+deploy-docs/build) * Log in (uses Elastic SSO)