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

fix: blue green deploy (backport #4414) #4418

Merged
merged 3 commits into from
Mar 28, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Mar 27, 2023

This is an automatic backport of pull request #4414 done by Mergify.
Cherry-pick of 5156eec has failed:

On branch mergify/bp/release-1.27.x/pr-4414
Your branch is up to date with 'origin/release-1.27.x'.

You are currently cherry-picking commit 5156eecb3.
  (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:   orca-clouddriver/src/main/java/com/netflix/spinnaker/orca/clouddriver/pipeline/manifest/DeployManifestStage.java
	both modified:   orca-clouddriver/src/test/java/com/netflix/spinnaker/orca/clouddriver/pipeline/manifest/DeployManifestStageTest.java

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

* fix(blue-green-deploy): removing old failed manifests

* fix(blue-green-deploy): refactoring

* fix(blue-green-deploy): refactoring

* fix(blue-green-deploy): added docs

* fix(blue-green-deploy): added test to validate new behaviour

(cherry picked from commit 5156eec)

# Conflicts:
#	orca-clouddriver/src/main/java/com/netflix/spinnaker/orca/clouddriver/pipeline/manifest/DeployManifestStage.java
#	orca-clouddriver/src/test/java/com/netflix/spinnaker/orca/clouddriver/pipeline/manifest/DeployManifestStageTest.java
@mergify mergify bot added the conflicts label Mar 27, 2023
@mergify mergify bot mentioned this pull request Mar 27, 2023
@spinnakerbot
Copy link
Contributor

Features cannot be merged into release branches. The following commits are not tagged as one of "fix, chore, docs, perf, test":

Read more about commit conventions and patch releases here.

@ovidiupopa07 ovidiupopa07 changed the title Fix/blue green deploy (backport #4414) fix: blue green deploy (backport #4414) Mar 27, 2023
@dogonthehorizon dogonthehorizon added the ready to merge Approved and ready for merge label Mar 28, 2023
@dogonthehorizon dogonthehorizon merged commit 4d53e3a into release-1.27.x Mar 28, 2023
@mergify mergify bot deleted the mergify/bp/release-1.27.x/pr-4414 branch March 28, 2023 15:33
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
ready to merge Approved and ready for merge target-release/1.27
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants