Enable Zesty-Ocata Amulet Tests
- Turn on Zesty-Ocata Amulet test definitions. - Standardize test-requirements.txt - Sync charm helpers for various fixes Change-Id: I4d33424517edbe40e0cfec74cac2860b3b2e11a4
This commit is contained in:
parent
083b0412d4
commit
1b3808c223
|
@ -11,15 +11,17 @@ requests==2.6.0
|
|||
# Liberty client lower constraints
|
||||
amulet>=1.14.3,<2.0
|
||||
bundletester>=0.6.1,<1.0
|
||||
python-ceilometerclient>=1.5.0,<2.0
|
||||
python-cinderclient>=1.4.0,<2.0
|
||||
python-glanceclient>=1.1.0,<2.0
|
||||
python-heatclient>=0.8.0,<1.0
|
||||
python-keystoneclient>=1.7.1,<2.0
|
||||
python-neutronclient>=3.1.0,<4.0
|
||||
python-novaclient>=2.30.1,<3.0
|
||||
python-openstackclient>=1.7.0,<2.0
|
||||
python-swiftclient>=2.6.0,<3.0
|
||||
python-ceilometerclient>=1.5.0
|
||||
python-cinderclient>=1.4.0
|
||||
python-glanceclient>=1.1.0
|
||||
python-heatclient>=0.8.0
|
||||
python-keystoneclient>=1.7.1
|
||||
python-neutronclient>=3.1.0
|
||||
python-novaclient>=2.30.1
|
||||
python-openstackclient>=1.7.0
|
||||
python-swiftclient>=2.6.0
|
||||
pika>=0.10.0,<1.0
|
||||
distro-info
|
||||
# END: Amulet OpenStack Charm Helper Requirements
|
||||
# NOTE: workaround for 14.04 pip/tox
|
||||
pytz
|
||||
|
|
|
@ -323,8 +323,8 @@ class HeatBasicDeployment(OpenStackAmuletDeployment):
|
|||
def _image_delete(self):
|
||||
"""Delete that image."""
|
||||
u.log.debug('Deleting glance image...')
|
||||
image = self.nova.images.find(name=IMAGE_NAME)
|
||||
u.delete_resource(self.nova.images, image, msg="glance image")
|
||||
image = self.nova.glance.find_image(IMAGE_NAME)
|
||||
u.delete_resource(self.glance.images, image, msg="glance image")
|
||||
|
||||
def _keypair_delete(self):
|
||||
"""Delete that keypair."""
|
||||
|
|
5
tox.ini
5
tox.ini
|
@ -21,6 +21,11 @@ basepython = python2.7
|
|||
deps = -r{toxinidir}/requirements.txt
|
||||
-r{toxinidir}/test-requirements.txt
|
||||
|
||||
[testenv:py35]
|
||||
basepython = python3.5
|
||||
deps = -r{toxinidir}/requirements.txt
|
||||
-r{toxinidir}/test-requirements.txt
|
||||
|
||||
[testenv:pep8]
|
||||
basepython = python2.7
|
||||
deps = -r{toxinidir}/requirements.txt
|
||||
|
|
Loading…
Reference in New Issue