juju-ci-tools

Merge lp://staging/~mskalka/juju-ci-tools/remove-constraints-from-bootstrap into lp://staging/juju-ci-tools

  1. remove-constraints-from-bootstrap
  2. Merge into trunk
Proposed by Michael Skalka
Status: Needs review
Proposed branch: lp://staging/~mskalka/juju-ci-tools/remove-constraints-from-bootstrap
Merge into: lp://staging/juju-ci-tools
Diff against target: 374 lines (+53/-51) (has conflicts)
6 files modified
jujupy/client.py (+12/-12)
jujupy/tests/test_client.py (+16/-23)
jujupy/version_client.py (+9/-0)
tests/test_assess_cloud.py (+3/-3)
tests/test_deploy_stack.py (+11/-11)
tests/test_industrial_test.py (+2/-2)
Text conflict in jujupy/tests/test_client.py
To merge this branch: bzr merge lp://staging/~mskalka/juju-ci-tools/remove-constraints-from-bootstrap
Reviewer Review Type Date Requested Status
Curtis Hovey (community) code Approve
Review via email: mp+321768@code.staging.launchpad.net

Description of the change

Removes forced constraints from Jujupy 2.x bootstraps with the exception of MaaS and Joyent environments where minimal constraints are needed. This forces Juju to determine its own instance type on bootstrap.

To post a comment you must log in.
Revision history for this message
Curtis Hovey (sinzui) wrote :

This is fine to merge, but you must also be prepare to revert. While mem=2G is being ignored by Juju 2 because it does not satisfy juju controller minimums, the value is still used in models. We may find some tests fail in some substrates because our tests do not set a minimum requirement.

If add_basic_testing_arguments() provided --constraints, could tune tests for substrates. This will be a requirement if you need to revert.

review: Approve (code)
Reply
Revision history for this message
Michael Skalka (mskalka) wrote :

Going back to the bug Aaron submitted, if we have a substrate that Juju is pulling invalid instance-types for then that needs to be fixed in Juju, not our tests. If that means our tests break until they fix it then that's what happens. I agree with his statement that Juju should work 'out of the box' in all 2.0 cases.

Regarding being used in models, is that in our own code? I'm not sure what you mean there.

I'm going to revert the restore_backup change, but I would like to hear your thoughts before I merge this.

Reply
lp://staging/~mskalka/juju-ci-tools/remove-constraints-from-bootstrap updated
1972. By Michael Skalka

reverted restore backup change

Unmerged revisions

1972. By Michael Skalka

reverted restore backup change

1971. By Michael Skalka

removed constraints from 2.x juju client bootstraps

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches