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.17](backport #1439) ci: use downstream pattern #1443

Merged
merged 4 commits into from
May 10, 2022
Merged

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented May 10, 2022

This is an automatic backport of pull request #1439 done by Mergify.
Cherry-pick of 9b2c061 has failed:

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

You are currently cherry-picking commit 9b2c061.
  (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/packaging.groovy

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

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 9b2c061)

# Conflicts:
#	.ci/Jenkinsfile
@mergify mergify bot requested a review from a team as a code owner May 10, 2022 13:00
@mergify mergify bot requested review from aleksmaus and narph May 10, 2022 13:00
@mergify mergify bot added backport conflicts There is a conflict in the backported pull request labels May 10, 2022
@mergify mergify bot assigned v1v May 10, 2022
@v1v
Copy link
Member

v1v commented May 10, 2022

Lets wait for backporting #756

@v1v
Copy link
Member

v1v commented May 10, 2022

@Mergifyio rebase

@mergify
Copy link
Contributor Author

mergify bot commented May 10, 2022

rebase

❌ Base branch update has failed

Git reported the following error:

Rebasing (1/1)
error: could not apply 7f9c12f... ci: use downstream pattern (#1439)
Resolve all conflicts manually, mark them as resolved with
"git add/rm <conflicted_files>", then run "git rebase --continue".
You can instead skip this commit: run "git rebase --skip".
To abort and get back to the state before "git rebase", run "git rebase --abort".
Could not apply 7f9c12f... ci: use downstream pattern (#1439)
Auto-merging .ci/Jenkinsfile
CONFLICT (content): Merge conflict in .ci/Jenkinsfile

err-code: 9CC70

@mergify
Copy link
Contributor Author

mergify bot commented May 10, 2022

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

…1439

* upstream/7.17:
  feat: add a make goal to check that all release artifacts are created… (#1445)
@v1v v1v requested a review from a team May 10, 2022 16:16
@v1v v1v removed the conflicts There is a conflict in the backported pull request label May 10, 2022
v1v
v1v previously approved these changes May 10, 2022
@elasticmachine
Copy link
Contributor

elasticmachine commented May 10, 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-05-10T16:51:13.567+0000

  • Duration: 9 min 33 sec

Test stats 🧪

Test Results
Failed 0
Passed 236
Skipped 0
Total 236

🤖 GitHub comments

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

  • /test : Re-trigger the build.

@v1v
Copy link
Member

v1v commented May 10, 2022

Requires #1450

@mergify
Copy link
Contributor Author

mergify bot commented May 10, 2022

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

.ci/Jenkinsfile Outdated Show resolved Hide resolved
@v1v
Copy link
Member

v1v commented May 10, 2022

Requires #1451

@v1v v1v merged commit 888b031 into 7.17 May 10, 2022
@mergify mergify bot deleted the mergify/bp/7.17/pr-1439 branch May 10, 2022 17:08
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants