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

[7.15](backport #28481) CI: disable e2e for elastic-agent on tags/branches #28490

Merged
merged 2 commits into from
Oct 19, 2021

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Oct 18, 2021

This is an automatic backport of pull request #28481 done by Mergify.
Cherry-pick of d1bcb50 has failed:

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

You are currently cherry-picking commit d1bcb503b7.
  (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:   Jenkinsfile
	both modified:   x-pack/elastic-agent/Jenkinsfile.yml

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.io/

(cherry picked from commit d1bcb50)

# Conflicts:
#	Jenkinsfile
#	x-pack/elastic-agent/Jenkinsfile.yml
@mergify mergify bot added backport conflicts There is a conflict in the backported pull request labels Oct 18, 2021
@mergify mergify bot assigned v1v Oct 18, 2021
@botelastic botelastic bot added the needs_team Indicates that the issue/PR needs a Team:* label label Oct 18, 2021
@mergify
Copy link
Contributor Author

mergify bot commented Oct 18, 2021

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.15/pr-28481 upstream/mergify/bp/7.15/pr-28481
git merge upstream/7.15
git push upstream mergify/bp/7.15/pr-28481

@v1v v1v closed this Oct 18, 2021
@mergify mergify bot deleted the mergify/bp/7.15/pr-28481 branch October 18, 2021 13:34
@v1v v1v restored the mergify/bp/7.15/pr-28481 branch October 18, 2021 13:42
…28481

* upstream/7.15:
  chore(ci): remove not used param when triggering e2e tests (#27823) (#27830)
  Run Python tests in libbeat (#28438) (#28486)
  [CI] Add E2E for x-pack/elastic-agent (fleet) (#24112) (#28466)
@v1v v1v reopened this Oct 18, 2021
@v1v v1v added automation Team:Automation Label for the Observability productivity team and removed needs_team Indicates that the issue/PR needs a Team:* label conflicts There is a conflict in the backported pull request labels Oct 18, 2021
@elasticmachine
Copy link
Collaborator

💚 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-18T13:44:31.856+0000

  • Duration: 216 min 51 sec

  • Commit: b070c8d

Test stats 🧪

Test Results
Failed 0
Passed 53139
Skipped 5274
Total 58413

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

@v1v v1v merged commit 12356e5 into 7.15 Oct 19, 2021
@mergify mergify bot deleted the mergify/bp/7.15/pr-28481 branch October 19, 2021 11:10
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
automation backport Team:Automation Label for the Observability productivity team
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants