Merge lp://staging/~gary/juju-gui/ci2 into lp://staging/juju-gui/experimental
Proposed by
Gary Poster
Status: | Merged |
---|---|
Merged at revision: | 478 |
Proposed branch: | lp://staging/~gary/juju-gui/ci2 |
Merge into: | lp://staging/juju-gui/experimental |
Diff against target: |
90 lines (+27/-15) 2 files modified
lib/deploy_charm_for_testing.py (+13/-6) test/test_charm_running.py (+14/-9) |
To merge this branch: | bzr merge lp://staging/~gary/juju-gui/ci2 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Juju GUI Hackers | Pending | ||
Review via email:
|
Description of the change
Tweak CI tests
Retry unit tests more, and only specify an instance type in canonistack.
To post a comment you must log in.
Reviewers: mp+156210_ code.launchpad. net,
Message:
Please take a look.
Description:
Tweak CI tests
Retry unit tests more, and only specify an instance type in canonistack.
https:/ /code.launchpad .net/~gary/ juju-gui/ ci2/+merge/ 156210
(do not edit description out of merge proposal)
Please review this at https:/ /codereview. appspot. com/8083044/
Affected files: charm_for_ testing. py charm_running. py
A [revision details]
M lib/deploy_
M test/test_
Index: [revision details]
=== added file '[revision details]'
--- [revision details] 2012-01-01 00:00:00 +0000
+++ [revision details] 2012-01-01 00:00:00 +0000
@@ -0,0 +1,2 @@
+Old revision: <email address hidden>
+New revision: <email address hidden>
Index: lib/deploy_ charm_for_ testing. py charm_for_ testing. py' charm_for_ testing. py 2013-03-28 15:40:14 +0000 charm_for_ testing. py 2013-03-29 18:16:49 +0000
print( err.output)
=== modified file 'lib/deploy_
--- lib/deploy_
+++ lib/deploy_
@@ -26,6 +26,7 @@
raise
+ subprocess. CalledProcessEr ror, tries=3)
wait_ for_machine= wait_for_ machine) : get("JUJU_ INSTANCE_ IP")
print( 'Bootstrapping. ..') type=m1. small') type=m1. small')
print( 'Deploying service...')
'juju-gui- source' : args.origin}
# We found that the juju status call fails intermittently in
# canonistack. This works around that particular fragility.
@retry(
@@ -99,13 +100,21 @@
"""Deploy the Juju GUI service and wait for it to become available."""
args = options()
+ # Get the IP that we should associate with the charm. This is only
used
+ # by Canonistack, and is effectively our flag for that environment.
+ instance_ip = os.environ.
try:
- juju('bootstrap --environment juju-gui-testing '
- '--constraints instance-
+ if instance_ip:
+ # We are deploying in Canonistack.
# The default m1.tiny was so small that the improv server would
- # sometimes fail to start. The m1.medium is more difficult to
obtain
- # on canonistack than m1.small, so m1.small seems to be "just
right"
+ # sometimes fail to start. The m1.medium is more difficult to
+ # obtain on canonistack than m1.small, so m1.small seems to be
+ # "just right."
+ juju('bootstrap --environment juju-gui-testing '
+ '--constraints instance-
+ else:
+ juju('bootstrap --environment juju-gui-testing')
options = {'serve-tests': True, 'staging': True, 'secure': False,
@@ -116,8 +125,6 @@
- # Fetches the instance ID from the testing instances to apply an
IP to
- instance_ip = os.environ.
if instance_ip:
Index: test/test_ charm_running. py charm_running. py' charm_running. py 2013-03-27 22:52:28 +0000 charm_running. py 2013-0...
=== modified file 'test/test_
--- test/test_
+++ test/test_