Skip to content
This repository was archived by the owner on Sep 17, 2024. It is now read-only.

[7.17](backport #2159) jjbb: daily job with branch aliases #2169

Merged
merged 2 commits into from
Feb 23, 2022

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Feb 22, 2022

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

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

You are currently cherry-picking commit bccd4856.
  (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)

Changes to be committed:
	modified:   .ci/e2eTestingFleetDaily.groovy
	modified:   .ci/e2eTestingHelmDaily.groovy
	modified:   .ci/e2eTestingK8SAutodiscoveryDaily.groovy
	new file:   .ci/jobs/e2e-testing-schedule-daily.yml
	new file:   .ci/schedule-daily.groovy

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   .backportrc.json
	both modified:   .ci/jobs/e2e-testing-fleet-daily-mbp.yml
	both modified:   .ci/jobs/e2e-testing-helm-daily-mbp.yml
	both modified:   .ci/jobs/e2e-testing-k8s-autodiscovery-daily-mbp.yml
	both modified:   .mergify.yml

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

(cherry picked from commit bccd485)

# Conflicts:
#	.backportrc.json
#	.ci/jobs/e2e-testing-fleet-daily-mbp.yml
#	.ci/jobs/e2e-testing-helm-daily-mbp.yml
#	.ci/jobs/e2e-testing-k8s-autodiscovery-daily-mbp.yml
#	.mergify.yml
@mergify mergify bot added the conflicts There is a conflict in the backported pull request label Feb 22, 2022
@mergify mergify bot assigned v1v Feb 22, 2022
@v1v v1v removed the conflicts There is a conflict in the backported pull request label Feb 22, 2022
@elasticmachine
Copy link
Contributor

elasticmachine commented Feb 22, 2022

💚 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-02-22T17:10:55.586+0000

  • Duration: 51 min 7 sec

Test stats 🧪

Test Results
Failed 0
Passed 253
Skipped 0
Total 253

💚 Flaky test report

Tests succeeded.

🤖 GitHub comments

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

  • /test : Re-trigger the build.

@v1v v1v merged commit 9b0e1eb into 7.17 Feb 23, 2022
@mergify mergify bot deleted the mergify/bp/7.17/pr-2159 branch February 23, 2022 12:16
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants