Enable Bionic as a gate test
Change bionic test from dev to gate for 18.05. Please merge charm-helpers first. https://github.com/juju/charm-helpers/pull/176 Change-Id: I4fb78042d7400a80dc5eda9a7b95d17392d32cc3
This commit is contained in:
parent
498f4a343b
commit
bf30000a11
|
@ -122,26 +122,12 @@ class KeystoneLDAPCharmDeployment(amulet_deployment.OpenStackAmuletDeployment):
|
||||||
self.keystone_ip = self.keystone_sentry.relation(
|
self.keystone_ip = self.keystone_sentry.relation(
|
||||||
'shared-db',
|
'shared-db',
|
||||||
'percona-cluster:shared-db')['private-address']
|
'percona-cluster:shared-db')['private-address']
|
||||||
# Authenticate admin with keystone endpoint
|
|
||||||
self.keystone = self.get_keystone_client(api_version=3)
|
|
||||||
|
|
||||||
def get_keystone_client(self, api_version=None, keystone_ip=None):
|
# Authenticate admin with keystone
|
||||||
if keystone_ip is None:
|
self.keystone_session, self.keystone = u.get_default_keystone_session(
|
||||||
keystone_ip = self.keystone_ip
|
self.keystone_sentry,
|
||||||
if api_version == 2:
|
openstack_release=self._get_openstack_release(),
|
||||||
return u.authenticate_keystone_admin(self.keystone_sentry,
|
api_version=3)
|
||||||
user='admin',
|
|
||||||
password='openstack',
|
|
||||||
tenant='admin',
|
|
||||||
api_version=api_version,
|
|
||||||
keystone_ip=keystone_ip)
|
|
||||||
else:
|
|
||||||
return u.authenticate_keystone_admin(self.keystone_sentry,
|
|
||||||
user='admin',
|
|
||||||
password='openstack',
|
|
||||||
project_name='admin',
|
|
||||||
api_version=api_version,
|
|
||||||
keystone_ip=keystone_ip)
|
|
||||||
|
|
||||||
def find_keystone_v3_user(self, client, username, domain):
|
def find_keystone_v3_user(self, client, username, domain):
|
||||||
"""Find a user within a specified keystone v3 domain"""
|
"""Find a user within a specified keystone v3 domain"""
|
||||||
|
|
|
@ -35,7 +35,7 @@ commands =
|
||||||
# Run a specific test as an Amulet smoke test (expected to always pass)
|
# Run a specific test as an Amulet smoke test (expected to always pass)
|
||||||
basepython = python2.7
|
basepython = python2.7
|
||||||
commands =
|
commands =
|
||||||
bundletester -vl DEBUG -r json -o func-results.json gate-basic-xenial-pike --no-destroy
|
bundletester -vl DEBUG -r json -o func-results.json gate-basic-bionic-queens --no-destroy
|
||||||
|
|
||||||
[testenv:func27-dfs]
|
[testenv:func27-dfs]
|
||||||
# Run all deploy-from-source tests which are +x (may not always pass!)
|
# Run all deploy-from-source tests which are +x (may not always pass!)
|
||||||
|
|
Loading…
Reference in New Issue