openstack
/
charm-tempest
Code Issues Proposed changes

Rebuild charm to pick up latest layer-openstack/fix venv action bug 

This is needed to work around a setuptool_scm bug.  Also, the action
file had to be re-arranged slightly to ensure the venv is set up
before anything from the wheelhouse is imported.

Change-Id: Ie913fb5946afdaf1bfb7fd9df8b5d053da82c535
This commit is contained in:
Alex Kavanagh 2018-05-24 15:46:17 +01:00
parent 0b52fc6955
commit 844da56675
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
rebuild
View File

@ -2,4 +2,4 @@
# when dependencies of the charm change,
# but nothing in the charm needs to.
# simply change the uuid to something new
a17bf1c0-2152-11e8-b051-135052a09299
ea22c8e2-cf80-42d4-8416-10b70d85d0f7

9
src/actions/run-tempest.py
View File

@ -2,16 +2,17 @@
import sys
sys.path.append('lib')
import charm.openstack.tempest as tempest
import charms.reactive.relations as relations
import charmhelpers.core.hookenv as hookenv
# Make sure that reactive is bootstrapped and all the states are setup
# properly
from charms.layer import basic
basic.bootstrap_charm_deps()
basic.init_config_states()
import charm.openstack.tempest as tempest
import charms.reactive.relations as relations
import charmhelpers.core.hookenv as hookenv
if __name__ == '__main__':
identity_int = relations.endpoint_from_flag('identity-admin.available')
if identity_int is None: