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.

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

backport: Add 8.4 branch #1223

Closed
wants to merge 1 commit into from
Closed

backport: Add 8.4 branch #1223

wants to merge 1 commit into from

Conversation

v1v
Copy link
Member

@v1v v1v commented Sep 16, 2022

Merge as soon as 8.4 branch was created. Auto-merge is not yet supported, see Mergifyio/mergify#2821

@v1v v1v requested a review from a team as a code owner September 16, 2022 08:49
@v1v v1v added impact:critical Immediate priority; high value or cost to the product. release Team:Automation Label for the Observability productivity team labels Sep 16, 2022
@v1v v1v requested a review from a team September 16, 2022 08:49
@mergify
Copy link
Contributor

mergify bot commented Sep 16, 2022

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-v./d./d./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.

@v1v
Copy link
Member Author

v1v commented Sep 16, 2022

This PR was created by running:

RELEASE_TYPE=patch \
  CURRENT_RELEASE=8.4.2 \
  PROJECT_OWNER=elastic \
  PROJECT=elastic-agent \
  make -C release_scripts prepare-next-release create-prs-next-release

@amannocci , I'm not sure if this PR is correct for patch releases since the existing backport labels are major.minor.0 based instead. Additionally the automation for the minor release 8.4.0 was already done in #784.

Would you mind double checking if this is the expected behaviour? Otherwise, would you mind revisiting the scripts to reflect the required changes? 🙏

@v1v v1v added the blocked label Sep 16, 2022
- name: backport patches to 8.4 branch
conditions:
- merged
- label=backport-v8.5.0
Copy link
Member Author

Choose a reason for hiding this comment

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

unexpected value!?

@elasticmachine
Copy link
Contributor

💚 Build Succeeded

the below badges are clickable and redirect to their specific view in the CI or DOCS
Pipeline View Test View Changes Artifacts preview preview

Expand to view the summary

Build stats

  • Start Time: 2022-09-16T08:49:44.860+0000

  • Duration: 17 min 27 sec

Test stats 🧪

Test Results
Failed 0
Passed 4935
Skipped 17
Total 4952

💚 Flaky test report

Tests succeeded.

🤖 GitHub comments

Expand to view the GitHub comments

To re-run your PR in the CI, just comment with:

  • /test : Re-trigger the build.

  • /package : Generate the packages.

  • run integration tests : Run the Elastic Agent Integration tests.

  • run end-to-end tests : Generate the packages and run the E2E Tests.

  • run elasticsearch-ci/docs : Re-trigger the docs validation. (use unformatted text in the comment!)

@elasticmachine
Copy link
Contributor

🌐 Coverage report

Name Metrics % (covered/total) Diff
Packages 97.333% (73/75) 👍
Files 68.085% (160/235) 👍
Classes 68.478% (315/460) 👍
Methods 52.826% (888/1681) 👍
Lines 38.887% (9558/24579) 👍 0.057
Conditionals 100.0% (0/0) 💚

@@ -207,6 +207,19 @@ pull_request_rules:
labels:
- "backport"
title: "[{{ destination_branch }}](backport #{{ number }}) {{ title }}"
- name: backport patches to 8.4 branch
Copy link
Member

Choose a reason for hiding this comment

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

The same block already exists below at line 223, likely because this shouldn't run for patch releases, only major/minor releases that create a new branch.

Copy link
Contributor

Choose a reason for hiding this comment

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

Yah, assuming this can be closed. Tell me and I'll re-open it if I'm wrong, hah.

@amannocci
Copy link
Contributor

This PR was created by running:

RELEASE_TYPE=patch \
  CURRENT_RELEASE=8.4.2 \
  PROJECT_OWNER=elastic \
  PROJECT=elastic-agent \
  make -C release_scripts prepare-next-release create-prs-next-release

@amannocci , I'm not sure if this PR is correct for patch releases since the existing backport labels are major.minor.0 based instead. Additionally the automation for the minor release 8.4.0 was already done in #784.

Would you mind double checking if this is the expected behaviour? Otherwise, would you mind revisiting the scripts to reflect the required changes? 🙏

I will check the behavior of the automation. AFAIK, we have two things wrong here. The PR should be raised only for minor/major releases and the merge within the mergify file isn't correct.

@amannocci amannocci deleted the add-backport-next-8.5.0 branch October 21, 2022 10:31
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport-skip blocked impact:critical Immediate priority; high value or cost to the product. release Team:Automation Label for the Observability productivity team
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants