diff options
| author |   Mark Beierl <mark.beierl@dell.com> | 2018-06-28 17:35:47 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2018-06-28 17:35:47 +0000 |
| commit | 9759cbb65e40c3e142b8a32dd1bb717ae65e15c2 (patch) | |
| tree | 1bf6a814c544ef7b40f1a5e3b67fb99021e196c5 | |
| parent | 0f3e771434ba7cf3270fda83c8943e700c026354 (diff) | |
| parent | b9bcdaaf946279c7e119caecf7eee9f87f449361 (diff) | |
Merge "Fixes daily run" into stable/fraser
| -rwxr-xr-x | ci/create_storperf_flavor.sh | 2 | ||||
| -rwxr-xr-x | ci/daily.sh | 1 | ||||
| -rw-r--r-- | docker/storperf-master/storperf/storperf_master.py | 2 |
3 files changed, 2 insertions, 3 deletions
diff --git a/ci/create_storperf_flavor.sh b/ci/create_storperf_flavor.sh index f25d56d..4f751f4 100755 --- a/ci/create_storperf_flavor.sh +++ b/ci/create_storperf_flavor.sh @@ -10,8 +10,6 @@ echo "Checking for StorPerf flavor" -openstack flavor delete storperf - FLAVOUR=`openstack flavor list | grep "storperf"` if [ -z "$FLAVOUR" ] then diff --git a/ci/daily.sh b/ci/daily.sh index 956b6e6..ada8cfd 100755 --- a/ci/daily.sh +++ b/ci/daily.sh @@ -36,6 +36,7 @@ pip install functools32==3.2.3.post2 pip install pytz==2016.10 pip install osc_lib==1.3.0 pip install python-openstackclient==3.7.0 +pip install python-heatclient==1.16.0 "${WORKSPACE}/ci/generate-admin-rc.sh" diff --git a/docker/storperf-master/storperf/storperf_master.py b/docker/storperf-master/storperf/storperf_master.py index 255bfa4..fae8dd6 100644 --- a/docker/storperf-master/storperf/storperf_master.py +++ b/docker/storperf-master/storperf/storperf_master.py @@ -304,7 +304,7 @@ class StorPerfMaster(object): 'storperf/resources/hot/storperf-volume.yaml'] self.stack_settings.env_values = self._make_parameters() try: - self.heat_stack.create() + self.heat_stack.create(block=True) except Exception as e: self.logger.error("Stack creation failed") self.logger.exception(e) |