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

backport: Add 7.16 branch #28560

Merged
merged 4 commits into from
Oct 20, 2021
Merged

backport: Add 7.16 branch #28560

merged 4 commits into from
Oct 20, 2021

Conversation

elasticmachine
Copy link
Collaborator

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

@elasticmachine elasticmachine self-assigned this Oct 20, 2021
@elasticmachine elasticmachine added impact:critical Immediate priority; high value or cost to the product. release Team:Automation Label for the Observability productivity team labels Oct 20, 2021
@botelastic botelastic bot added the needs_team Indicates that the issue/PR needs a Team:* label label Oct 20, 2021
@elasticmachine elasticmachine requested a review from a team October 20, 2021 08:59
@botelastic botelastic bot removed the needs_team Indicates that the issue/PR needs a Team:* label label Oct 20, 2021
@mergify
Copy link
Contributor

mergify bot commented Oct 20, 2021

This pull request does not have a backport label. Could you fix it @elasticmachine? 🙏
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 7./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 Oct 20, 2021
@elasticmachine
Copy link
Collaborator Author

elasticmachine commented Oct 20, 2021 •
edited by jenkins-beats-ci bot
Loading

💚 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: 2021-10-20T11:01:56.794+0000

  • Duration: 25 min 10 sec

  • Commit: 41e2ec1

Test stats 🧪

Test Results
Failed 0
Passed 3
Skipped 0
Total 3

💚 Flaky test report

Tests succeeded.

🤖 GitHub comments

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

  • /test : Re-trigger the build.

  • /package : Generate the packages and run the E2E tests.

  • /beats-tester : Run the installation tests with beats-tester.

andresrc
andresrc reviewed Oct 20, 2021
View reviewed changes
.mergify.yml Outdated
@@ -127,7 +127,7 @@ pull_request_rules:
- name: backport patches to 7.x branch
conditions:
- merged
- label=backport-v7.16.0
- label=backport-v7.17.0
Copy link
Contributor

Choose a reason for hiding this comment

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

@ruflin @v1v I will revert this part

andresrc
andresrc reviewed Oct 20, 2021
View reviewed changes
.mergify.yml
@@ -163,3 +163,16 @@ pull_request_rules:
labels:
- "backport"
title: "[{{ destination_branch }}](backport #{{ number }}) {{ title }}"
- name: backport patches to 7.16 branch
Copy link
Contributor

Choose a reason for hiding this comment

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

@ruflin @v1v we keep this addition to handle dangling PRs after FF

Copy link
Contributor

Choose a reason for hiding this comment

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

I think this depends on the above if we "rename" branches from 7.x to 7.16 or if we branch off 7.16 and delete 7.x? I don't know what Github will do with the dangling PR's. In case of doubt, I would keep it.

ruflin
ruflin reviewed Oct 20, 2021
View reviewed changes
.backportrc.json Outdated
@@ -1,6 +1,6 @@
{
"upstream": "elastic/beats",
"branches": [ { "name": "7.x", "checked": true }, "7.15", "7.14" ],
"branches": [ { "name": "7.x", "checked": true }, "7.16", "7.15", "7.14" ],
Copy link
Contributor

Choose a reason for hiding this comment

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

AFAIK the 7.x branch will be renamed to 7.16, so no 7.x will exists anymore.

.mergify.yml
@@ -163,3 +163,16 @@ pull_request_rules:
labels:
- "backport"
title: "[{{ destination_branch }}](backport #{{ number }}) {{ title }}"
- name: backport patches to 7.16 branch
Copy link
Contributor

Choose a reason for hiding this comment

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

I think this depends on the above if we "rename" branches from 7.x to 7.16 or if we branch off 7.16 and delete 7.x? I don't know what Github will do with the dangling PR's. In case of doubt, I would keep it.

andresrc
andresrc reviewed Oct 20, 2021
View reviewed changes
.mergify.yml
@@ -133,7 +133,7 @@ pull_request_rules:
assignees:
- "{{ author }}"
branches:
- "7.x"
- "7.16"
Copy link
Contributor

Choose a reason for hiding this comment

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

if someone uses the backport-7.x label we want it to go to 7.16

@andresrc andresrc merged commit 78fedf3 into master Oct 20, 2021
@andresrc andresrc deleted the add-backport-next_7.17.0 branch October 20, 2021 14:38
@mdelapenya mdelapenya mentioned this pull request Oct 20, 2021
Closed
v1v added a commit to v1v/beats that referenced this pull request Oct 26, 2021
@v1v
Merge remote-tracking branch 'upstream/master' into feature/remove-jo…
fcc08d9 
…urnalbeat-ci

* upstream/master: (49 commits)
  [CI]: use the downstream packaging pipeline for branches/tags (elastic#28589)
  fix: use declarative style for complete variant of the elastic-agent (elastic#28526)
  x-pack/auditbeat/tracing: fix regexp for kprobe description line (elastic#28609)
  docs: Update `api_key` example on elasticsearch output (elastic#28606)
  chore: add build scripts to CODEOWNERS (elastic#28615)
  Osquerybeat: Fix host_processes missing cmdline arguments (elastic#28622)
  Add note about changes to regexp package in Golang (elastic#28616)
  CI: nightly/weekly builds for 7.x targeting 7.16 instead (elastic#28612)
  Osquerybeat: Fix extenstion unable to start on windows (elastic#28598)
  Osquerybeat: Return the query result count with the action response (elastic#28576)
  Agent: Allow custom response properties in the action response (elastic#28575)
  [Heartbeat] Only setuid in elastic-agent image (elastic#28577)
  Fix formatting of `mapStateJSON` and `layerListJSON` in dashboard assets (elastic#28530)
  CI: refactor the run e2e build (elastic#28502)
  Use fsnotify with long windows name-safe changes (elastic#28517)
  Remove unneeded mergify config
  backport: Add 7.16 branch (elastic#28560)
  Add proxy_url support to threatintel module's malwarebazaar fileset (elastic#28533)
  Osquerybeat: Implement host_users, host_groups, host_processes tables as a part of our osquery_extension. (elastic#28434)
  [Heartbeat] Make run_once syntax a boolean (elastic#28548)
  ...
Icedroid pushed a commit to Icedroid/beats that referenced this pull request Nov 1, 2021
@elasticmachine @andresrc
backport: Add 7.16 branch (elastic#28560)
976ca90 
* chore: add-backport-next

* There will be no 7.17

* Missing change

* Let's move to mergify

Co-authored-by: Andres Rodriguez <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ruflin ruflin ruflin left review comments

@andresrc andresrc andresrc approved these changes

Assignees

@elasticmachine elasticmachine

Labels
backport-skip Skip notification from the automated backport with mergify impact:critical Immediate priority; high value or cost to the product. release Team:Automation Label for the Observability productivity team
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@elasticmachine @ruflin @andresrc