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.

Sign up for GitHub

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

Jump to bottom

Fix the series selection logic for deploying local charms. #7285

Merged
merged 1 commit into from Apr 27, 2017
Merged

Fix the series selection logic for deploying local charms. #7285

merged 1 commit into from Apr 27, 2017

Conversation

howbazaar
Copy link
Contributor

Description of change

There was incorrect logic around old style local charms and the series that should be used by default.
The seriesSelector object now holds all that logic. Precedence is as follows:

  • series specified on the command line
  • series determined through charm URL
  • model default series
  • errors if none of those are specified

QA steps

This will fix our CI test failures where they are deploying an old style charm with no series specified in the metadata.

wallyworld
wallyworld approved these changes Apr 27, 2017
View reviewed changes
cmd/juju/application/series_selector.go Outdated
//
// This type should really have a Validate method, as the force flag
// is really only valid if the seriesFlag is specified.
// There is code and tests that allow the force flag when series isn't
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we make this a TODO.
Bonus points for a tech-debt bug.

@howbazaar
Copy link
Contributor Author

$$merge$$

@jujubot
Copy link
Collaborator

jujubot commented Apr 27, 2017

Status: merge request accepted. Url: http://juju-ci.vapour.ws:8080/job/github-merge-juju

@jujubot
Copy link
Collaborator

jujubot commented Apr 27, 2017

Build failed: Tests failed
build url: http://juju-ci.vapour.ws:8080/job/github-merge-juju/10767

@howbazaar
Copy link
Contributor Author

$$try-again$$

@jujubot
Copy link
Collaborator

jujubot commented Apr 27, 2017

Status: merge request accepted. Url: http://juju-ci.vapour.ws:8080/job/github-merge-juju

@jujubot
Copy link
Collaborator

jujubot commented Apr 27, 2017

Build failed: Tests failed
build url: http://juju-ci.vapour.ws:8080/job/github-merge-juju/10771

@howbazaar
Copy link
Contributor Author

$$intermittent$$

@jujubot
Copy link
Collaborator

jujubot commented Apr 27, 2017

Status: merge request accepted. Url: http://juju-ci.vapour.ws:8080/job/github-merge-juju

@jujubot
Copy link
Collaborator

jujubot commented Apr 27, 2017

Build failed: Tests failed
build url: http://juju-ci.vapour.ws:8080/job/github-merge-juju/10781

@howbazaar
Copy link
Contributor Author

$$merge$$

@jujubot
Copy link
Collaborator

jujubot commented Apr 27, 2017

Status: merge request accepted. Url: http://juju-ci.vapour.ws:8080/job/github-merge-juju

@jujubot jujubot merged commit 95afb29 into juju:develop Apr 27, 2017
@howbazaar howbazaar deleted the fix-series-selector branch April 27, 2017 20:37
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@wallyworld wallyworld wallyworld approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
3 participants
@howbazaar @jujubot @wallyworld