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

Jump to bottom

ci(release): automate release steps for the minor #12233

Merged
merged 69 commits into from
Jan 8, 2024
Merged

ci(release): automate release steps for the minor #12233

merged 69 commits into from
Jan 8, 2024

Conversation

v1v
Copy link
Member

@v1v v1v commented Dec 18, 2023 •
edited
Loading

Motivation/summary

  • Delegate the FF/Post Release steps to be defined in the project.
  • Use GitHub actions with a well-defined contract (input parameters).
  • Those Actions could be called by the Unified Release automatically using workflow_dispatch.

See the test section in the description that explains what PRs and changes have been done when running the GitHub workflow.

patch release to be done in a follow up.

Checklist

For functional changes, consider:

  • Is it observable through the addition of either logging or metrics?
  • Is its use being published in telemetry to enable product improvement?
  • Have system tests been added to avoid regression?

How to test these changes

Minor release

I used my fork to test this out:

For such I ran https://github.com/v1v/apm-server/actions/runs/7288901075 with 8.13.0 and it created:

UI interactions

Once they get triggered through the GitHub actions UI then some slack notifications are sent:

image image image

@mergify Mergify
Copy link
Contributor

mergify bot commented Dec 18, 2023

This pull request does not have a backport label. Could you fix it @v1v? 🙏
To fixup this pull request, you need to add the backport labels for the needed
branches, such as:

  • backport-7.17 is the label to automatically backport to the 7.17 branch.
  • backport-8./d is the label to automatically backport to the 8./d branch. /d is the digit.

NOTE: backport-skip has been added to this pull request.

@mergify mergify bot added the backport-skip Skip notification from the automated backport with mergify label Dec 18, 2023
@v1v v1v mentioned this pull request Dec 18, 2023
Merged
3 tasks
@mergify Mergify
Copy link
Contributor

mergify bot commented Dec 19, 2023

This pull request is now in conflicts. Could you fix it @v1v? 🙏
To fixup this pull request, you can check out it locally. See documentation: https://help.github.com/articles/checking-out-pull-requests-locally/

git fetch upstream
git checkout -b feature/automate-release-process upstream/feature/automate-release-process
git merge upstream/main
git push upstream feature/automate-release-process

v1v added 25 commits December 19, 2023 13:49
@v1v
Merge remote-tracking branch 'upstream/main' into feature/automate-re…
d496968 
…lease-process

* upstream/main:
  ci(release): automate release steps (#12234)
  build(deps): bump the github-actions group with 1 update (#12232)
  [updatecli] Update to elastic/beats@a633696068ed (#12164)
  [updatecli] Bump elastic stack version to 8.13.0-h30gube9 (#12235)
@v1v
refactor a bit
170be4c
@v1v
report non supported versions
14b37df
@v1v
rename make goals and add some docs
01a46d9
@v1v
cosmetic changes in the slack messages
5160ab9
@v1v
support slack threads
26b7c55
@v1v
fix
1e6b4b6
@v1v
chore
e530a73
@v1v
chore
0144e15
@v1v
refactor: patch
40c915e
@v1v
refactor: minor
f23de22
@v1v
fix
40e1680
@v1v
use slack channel env
6bde939
@v1v
use output slack-thread
7bb4582
@v1v
avoid concurrency
677b466
@v1v
support full checkout and validaitons
73b1a28
@v1v
notify what's the error if any failure
e33feb6
@v1v
fix
bf6e5f7
@v1v
chore
12453ef
@v1v
initial
01248e5
@v1v
exclude
04ce400
@v1v
chore
e4af33a
@v1v
enable mergify and yq
6e60869
@v1v
update mergify if required
299e6d8
@v1v
Revert "update mergify if required"
05de44a 
This reverts commit 299e6d8.
@v1v v1v added the backport-8.12 Automated backport with mergify label Dec 21, 2023
@v1v v1v self-assigned this Dec 21, 2023
@v1v v1v requested a review from a team December 21, 2023 13:46
@v1v v1v marked this pull request as ready for review December 21, 2023 13:46
@v1v v1v requested a review from a team as a code owner December 21, 2023 13:46
v1v
v1v commented Dec 21, 2023
View reviewed changes
.github/workflows/prepare-release/action.yml
@@ -0,0 +1,109 @@
---
Copy link
Member Author

Choose a reason for hiding this comment

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

To help run some pre-flight validations

@v1v v1v mentioned this pull request Dec 21, 2023
Merged
3 tasks
@carsonip
Copy link
Member

carsonip commented Jan 3, 2024

Let's see if #12333 fixes the lint check error

@kruskall kruskall enabled auto-merge (squash) January 8, 2024 02:20
@kruskall kruskall merged commit 7f98e30 into main Jan 8, 2024
11 of 12 checks passed
@kruskall kruskall deleted the feature/automate-release-process branch January 8, 2024 02:36
mergify bot pushed a commit that referenced this pull request Jan 8, 2024
@v1v @mergify
ci(release): automate release steps for the minor (#12233)
0fafd11 
* ci(release): automate release steps

* refactor a bit

* report non supported versions

* rename make goals and add some docs

* cosmetic changes in the slack messages

* support slack threads

* fix

* chore

* chore

* refactor: patch

* refactor: minor

* fix

* use slack channel env

* use output slack-thread

* avoid concurrency

* support full checkout and validaitons

* notify what's the error if any failure

* fix

* chore

* initial

* exclude

* chore

* enable mergify and yq

* update mergify if required

* Revert "update mergify if required"

This reverts commit 299e6d8.

* update mergify if required

* use RELEASE_BRANCH

add create make goal

* fix

* support prs

* run only if things were created correctly

* fix

* force branch

* refactor

* refactor

* github warn

* enable

* set makefile and use variable

* fix

* fix

* create head

* update changelog

* replace compare

* modify

* partial

* fix

* fix

* refactor

* docs

* test

* action: grant permissions

* notify if failrues

* use base branch

* fix hardcoded value

* remove leaving directory

* cannot user github bot to create PRs

* chore

* enable

* chore

* fix

* production

* use release version

* support for #12251

---------

Co-authored-by: Silvia Mitter <silvia.mitter@elastic.co>
Co-authored-by: Carson Ip <carsonip@users.noreply.github.com>
(cherry picked from commit 7f98e30)

# Conflicts:
#	.github/workflows/run-minor-release.yml
#	.github/workflows/run-patch-release.yml
#	.gitignore
#	Makefile
mergify bot pushed a commit that referenced this pull request Jan 8, 2024
@v1v @mergify
ci(release): automate release steps for the minor (#12233)
a7f86b0 
* ci(release): automate release steps

* refactor a bit

* report non supported versions

* rename make goals and add some docs

* cosmetic changes in the slack messages

* support slack threads

* fix

* chore

* chore

* refactor: patch

* refactor: minor

* fix

* use slack channel env

* use output slack-thread

* avoid concurrency

* support full checkout and validaitons

* notify what's the error if any failure

* fix

* chore

* initial

* exclude

* chore

* enable mergify and yq

* update mergify if required

* Revert "update mergify if required"

This reverts commit 299e6d8.

* update mergify if required

* use RELEASE_BRANCH

add create make goal

* fix

* support prs

* run only if things were created correctly

* fix

* force branch

* refactor

* refactor

* github warn

* enable

* set makefile and use variable

* fix

* fix

* create head

* update changelog

* replace compare

* modify

* partial

* fix

* fix

* refactor

* docs

* test

* action: grant permissions

* notify if failrues

* use base branch

* fix hardcoded value

* remove leaving directory

* cannot user github bot to create PRs

* chore

* enable

* chore

* fix

* production

* use release version

* support for #12251

---------

Co-authored-by: Silvia Mitter <silvia.mitter@elastic.co>
Co-authored-by: Carson Ip <carsonip@users.noreply.github.com>
(cherry picked from commit 7f98e30)

# Conflicts:
#	.github/workflows/run-minor-release.yml
#	.github/workflows/run-patch-release.yml
This was referenced Jan 8, 2024
Closed
Merged
@v1v
Copy link
Member Author

v1v commented Jan 9, 2024

@Mergifyio backport 7.17

@v1v
Copy link
Member Author

v1v commented Jan 9, 2024

@Mergifyio backport 8.12

@mergify Mergify
Copy link
Contributor

mergify bot commented Jan 9, 2024

backport 7.17

✅ Backports have been created

@mergify Mergify
Copy link
Contributor

mergify bot commented Jan 9, 2024

backport 8.12

✅ Backports have been created

mergify bot added a commit that referenced this pull request Jan 9, 2024
@mergify @v1v
ci(release): automate release steps for the minor (#12233) (#12367)
3e0d0cc 
* ci(release): automate release steps

* refactor a bit

* report non supported versions

* rename make goals and add some docs

* cosmetic changes in the slack messages

* support slack threads

* fix

* chore

* chore

* refactor: patch

* refactor: minor

* fix

* use slack channel env

* use output slack-thread

* avoid concurrency

* support full checkout and validaitons

* notify what's the error if any failure

* fix

* chore

* initial

* exclude

* chore

* enable mergify and yq

* update mergify if required

* Revert "update mergify if required"

This reverts commit 299e6d8.

* update mergify if required

* use RELEASE_BRANCH

add create make goal

* fix

* support prs

* run only if things were created correctly

* fix

* force branch

* refactor

* refactor

* github warn

* enable

* set makefile and use variable

* fix

* fix

* create head

* update changelog

* replace compare

* modify

* partial

* fix

* fix

* refactor

* docs

* test

* action: grant permissions

* notify if failrues

* use base branch

* fix hardcoded value

* remove leaving directory

* cannot user github bot to create PRs

* chore

* enable

* chore

* fix

* production

* use release version

* support for #12251

---------

Co-authored-by: Silvia Mitter <silvia.mitter@elastic.co>
Co-authored-by: Carson Ip <carsonip@users.noreply.github.com>
(cherry picked from commit 7f98e30)

# Conflicts:
#	.github/workflows/run-minor-release.yml
#	.github/workflows/run-patch-release.yml

Co-authored-by: Victor Martinez <victormartinezrubio@gmail.com>
Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
v1v added a commit to v1v/apm-server that referenced this pull request Jan 10, 2024
@v1v
Merge branch 'feature/patch-release' into 8.11
82de42a 
* feature/patch-release: (249 commits)
  Update release.mk
  [updatecli] Bump elastic stack version to 8.13.0-8upz6ftd (elastic#12380)
  chore: Update to elastic/beats@95f0f85a3edd (elastic#12370)
  ci(release): automate release steps for the minor (elastic#12233)
  build(deps): bump the github-actions group with 1 update (elastic#12365)
  chore: Update to elastic/beats@d1b32774aef4 (elastic#12362)
  [updatecli] Bump elastic stack version to 8.13.0-ybxdr713 (elastic#12349)
  chore: Update to elastic/beats@81ebafc4c2da (elastic#12352)
  [apm docs consolidation] Delete moved files, update README (elastic#12341)
  [updatecli] Bump elastic stack version to 8.13.0-toucn398 (elastic#12325)
  docs: fix incorrect filenames in a document for Windows (elastic#12343)
  chore: Update to elastic/beats@6f192c01ef19 (elastic#12337)
  build(deps): bump golang.org/x/crypto from 0.14.0 to 0.17.0 (elastic#12237)
  Update NOTICE.txt year (elastic#12333)
  build(deps): bump the github-actions group with 1 update (elastic#12322)
  [updatecli] Bump elastic stack version to 8.13.0-4f8l51qr (elastic#12315)
  docs: Update known issues as fix was released (elastic#12196)
  feat: use latest apm-data to set success `event.outcome` when otel span.Status is Unset (elastic#12199)
  [updatecli] Bump elastic stack version to 8.13.0-4aavtlfc (elastic#12304)
  chore: rename apm-mutating-webhook to apm-k8s-attacher (elastic#12222)
  ...
@v1v v1v mentioned this pull request Jan 15, 2024
Closed
@v1v
Copy link
Member Author

v1v commented Jan 15, 2024

💚 All backports created successfully

Status Branch Result
✅ 7.17

Questions ?

Please refer to the Backport tool documentation

v1v added a commit to v1v/apm-server that referenced this pull request Jan 15, 2024
@v1v
ci(release): automate release steps for the minor (elastic#12233)
b476a44 
* ci(release): automate release steps

* refactor a bit

* report non supported versions

* rename make goals and add some docs

* cosmetic changes in the slack messages

* support slack threads

* fix

* chore

* chore

* refactor: patch

* refactor: minor

* fix

* use slack channel env

* use output slack-thread

* avoid concurrency

* support full checkout and validaitons

* notify what's the error if any failure

* fix

* chore

* initial

* exclude

* chore

* enable mergify and yq

* update mergify if required

* Revert "update mergify if required"

This reverts commit 299e6d8.

* update mergify if required

* use RELEASE_BRANCH

add create make goal

* fix

* support prs

* run only if things were created correctly

* fix

* force branch

* refactor

* refactor

* github warn

* enable

* set makefile and use variable

* fix

* fix

* create head

* update changelog

* replace compare

* modify

* partial

* fix

* fix

* refactor

* docs

* test

* action: grant permissions

* notify if failrues

* use base branch

* fix hardcoded value

* remove leaving directory

* cannot user github bot to create PRs

* chore

* enable

* chore

* fix

* production

* use release version

* support for elastic#12251

---------

Co-authored-by: Silvia Mitter <silvia.mitter@elastic.co>
Co-authored-by: Carson Ip <carsonip@users.noreply.github.com>
(cherry picked from commit 7f98e30)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@carsonip carsonip carsonip approved these changes

Assignees

@v1v v1v

Labels
backport-7.17 Automated backport with mergify to the 7.17 branch backport-8.12 Automated backport with mergify
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@v1v @carsonip @kruskall @simitt