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(provider/openstack): Properly set the attributes of a strtegy pipeline #7137

Merged
merged 1 commit into from
Jun 21, 2019

Conversation

randomswdev
Copy link

The openstack clouddriver in Deck does not properly set the ID of a strategy pipeline when used as a custom step in a deploy pipeline.

This makes Orca fail the lookup of the strategy pipeline when executing the deployment. The pull request is aimed at properly setting the required attributes.

@anotherchrisberry
Copy link
Contributor

LGTM - @maggieneterval should this go into master and be cherry picked into the release branch?

@maggieneterval
Copy link
Contributor

@anotherchrisberry Sure thing, I can take care of that!

@maggieneterval maggieneterval self-requested a review June 21, 2019 15:18
@maggieneterval maggieneterval merged commit f50e952 into spinnaker:release-1.13.x Jun 21, 2019
@maggieneterval
Copy link
Contributor

@spinnakerbot cherry-pick 1.14

@spinnakerbot
Copy link
Contributor

Cherry pick failed: Command failed (cherry pick commit f50e952) with exit code 1:

error: could not apply f50e95274... fix(provider/openstack): Properly set the attributes of a strtegy pipeline (#7137)
hint: after resolving the conflicts, mark the corrected paths
hint: with 'git add <paths>' or 'git rm <paths>'
hint: and commit the result with 'git commit'

@maggieneterval
Copy link
Contributor

Whoops my bad, I didn't realize this PR was against the 1.13 release branch and not master -- @randomswdev, is there a reason that we only need this commit for 1.13? Generally our pattern is to merge commits into the master branch, and then cherry-pick the commits back to prior releases as needed. If this is a fix that applies to master and 1.14 as well, would you mind opening another PR against master? Then we can merge that, and cherry-pick back to 1.14 as well. Otherwise, if this fix does for some reason only apply to 1.13, just let me know! Thanks! 😄

@randomswdev
Copy link
Author

My understanding is that openstack has been removed from spinnaker versions > 1.13 (so the openstack code is no longer present or is planned to be removed).. For this reason I'm targeting this to 1.13.
There are some discussions in our team about offering our help for supporting/maintaining the openstack driver in newer releases of spinnaker. If we decide to move forward with this proposal, we will open an issue and decide with the community if/how to restore the openstack code in newer releases.

@anotherchrisberry
Copy link
Contributor

Oh, right, that makes sense @randomswdev - sorry for the confusion!

@maggieneterval
Copy link
Contributor

Thanks @randomswdev, and yes, sorry for the confusion!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants