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

[7.17](backport #31531) chore: use a different e2e profile for running them from Beats #31571

Merged
merged 2 commits into from
Jun 15, 2022
Merged

[7.17](backport #31531) chore: use a different e2e profile for running them from Beats #31571

merged 2 commits into from
Jun 15, 2022

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented May 10, 2022 •
edited by zube bot
Loading

This is an automatic backport of pull request #31531 done by Mergify.
Cherry-pick of 03b013e has failed:

On branch mergify/bp/7.17/pr-31531
Your branch is up to date with 'origin/7.17'.

You are currently cherry-picking commit 03b013e63c.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   .ci/packaging.groovy

no changes added to commit (use "git add" and/or "git commit -a")

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

@mdelapenya @mergify
chore: use a different e2e profile for running them from Beats (#31531)
653144e 
* chore: use a different e2e profile for running them from Beats

The e2e supports passing profile, which is used to execute a different combination of scenarios/suites to be run in different OSs/Archs

* fix: file extension

(cherry picked from commit 03b013e)

# Conflicts:
#	.ci/packaging.groovy
@mergify mergify bot requested a review from a team as a code owner May 10, 2022 13:47
@mergify mergify bot requested review from fearful-symmetry and leehinman and removed request for a team May 10, 2022 13:47
@mergify mergify bot added backport conflicts There is a conflict in the backported pull request labels May 10, 2022
@botelastic botelastic bot added the needs_team Indicates that the issue/PR needs a Team:* label label May 10, 2022
mdelapenya
mdelapenya reviewed May 10, 2022
View reviewed changes
.ci/packaging.groovy Outdated
@@ -385,6 +385,18 @@ def runE2ETests(){
propagate: true,
wait: true)
}
<<<<<<< HEAD
Copy link
Contributor

Choose a reason for hiding this comment

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

@v1v are we missing a backport here?

Copy link
Member

Choose a reason for hiding this comment

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

#31135 was not backported since DRA was not enabled for 8.1 but >= 8.2

Copy link
Contributor

Choose a reason for hiding this comment

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

Should we discard this PR then?

Copy link
Member

Choose a reason for hiding this comment

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

@mdelapenya @v1v is this PR still relevant or it's meant to be discarded? I'm confused by the comments in this thread.

@elasticmachine
Copy link
Collaborator

elasticmachine commented May 10, 2022 •
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: 2022-06-14T15:55:06.792+0000

  • Duration: 14 min 35 sec

❕ Flaky test report

No test was executed to be analysed.

🤖 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.

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

@mergify
Copy link
Contributor Author

mergify bot commented May 16, 2022

This pull request has not been merged yet. Could you please review and merge it @mdelapenya? 🙏

rdner
rdner requested changes May 16, 2022
View reviewed changes
.ci/packaging.groovy Outdated Show resolved Hide resolved
@mergify
Copy link
Contributor Author

mergify bot commented May 23, 2022

This pull request has not been merged yet. Could you please review and merge it @mdelapenya? 🙏

1 similar comment
@mergify
Copy link
Contributor Author

mergify bot commented May 30, 2022

This pull request has not been merged yet. Could you please review and merge it @mdelapenya? 🙏

@mtojek mtojek added the Team:Elastic-Agent-Data-Plane Label for the Agent Data Plane team label May 30, 2022
@elasticmachine
Copy link
Collaborator

Pinging @elastic/elastic-agent-data-plane (Team:Elastic-Agent-Data-Plane)

@botelastic botelastic bot removed the needs_team Indicates that the issue/PR needs a Team:* label label May 30, 2022
@mergify
Copy link
Contributor Author

mergify bot commented Jun 6, 2022

This pull request has not been merged yet. Could you please review and merge it @mdelapenya? 🙏

1 similar comment
@mergify
Copy link
Contributor Author

mergify bot commented Jun 13, 2022

This pull request has not been merged yet. Could you please review and merge it @mdelapenya? 🙏

@mdelapenya mdelapenya mentioned this pull request Jun 14, 2022
Merged
@mergify
Copy link
Contributor Author

mergify bot commented Jun 14, 2022

This pull request is now in conflicts. Could you fix it? 🙏
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 mergify/bp/7.17/pr-31531 upstream/mergify/bp/7.17/pr-31531
git merge upstream/7.17
git push upstream mergify/bp/7.17/pr-31531

@mdelapenya
Copy link
Contributor

@Mergifyio refresh

@mergify
Copy link
Contributor Author

mergify bot commented Jun 14, 2022

refresh

✅ Pull request refreshed

@mdelapenya mdelapenya requested a review from rdner June 14, 2022 15:55
@mdelapenya mdelapenya merged commit 77c8856 into 7.17 Jun 15, 2022
@mergify mergify bot deleted the mergify/bp/7.17/pr-31531 branch June 15, 2022 11:29
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@v1v v1v v1v left review comments

@mdelapenya mdelapenya mdelapenya left review comments

@rdner rdner rdner approved these changes

@fearful-symmetry fearful-symmetry Awaiting requested review from fearful-symmetry fearful-symmetry is a code owner automatically assigned from elastic/elastic-agent-data-plane

@leehinman leehinman Awaiting requested review from leehinman leehinman is a code owner automatically assigned from elastic/elastic-agent-data-plane

Assignees

@mdelapenya mdelapenya

Labels
backport conflicts There is a conflict in the backported pull request Team:Elastic-Agent-Data-Plane Label for the Agent Data Plane team
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@elasticmachine @mdelapenya @rdner @v1v @mtojek