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

[7.16](backport #2044) chore: split stack configuration and start into two tasks #2047

Merged
merged 2 commits into from
Jan 24, 2022

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jan 24, 2022

This is an automatic backport of pull request #2044 done by Mergify.
Cherry-pick of 6d13132 has failed:

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

You are currently cherry-picking commit 6d131326.
  (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/ansible/playbook.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.com

(cherry picked from commit 6d13132)

# Conflicts:
#	.ci/ansible/playbook.yml
@mergify mergify bot added the conflicts There is a conflict in the backported pull request label Jan 24, 2022
@elasticmachine
Copy link
Contributor

elasticmachine commented Jan 24, 2022

💚 Flaky test report

Tests succeeded.

🤖 GitHub comments

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

  • /test : Re-trigger the build.

@mergify
Copy link
Contributor Author

mergify bot commented Jan 24, 2022

This pull request is now in conflict. 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.16/pr-2044 upstream/mergify/bp/7.16/pr-2044
git merge upstream/7.16
git push upstream mergify/bp/7.16/pr-2044

@mdelapenya mdelapenya removed the conflicts There is a conflict in the backported pull request label Jan 24, 2022
@mdelapenya mdelapenya merged commit 836fbaf into 7.16 Jan 24, 2022
@mergify mergify bot deleted the mergify/bp/7.16/pr-2044 branch January 24, 2022 12:52
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