diff options
| author |   Cédric Ollivier <cedric.ollivier@orange.com> | 2017-06-30 09:13:17 +0200 |
|---|---|---|
| committer | Cédric Ollivier <cedric.ollivier@orange.com> | 2017-06-30 14:33:03 +0200 |
| commit | 1b838b4bd75f21e45e8a40407b1e3279dd5935d2 (patch) | |
| tree | 86046239cf5057b987d9b76ab70c14df60a60888 /functest/ci/prepare_env.py | |
| parent | 678609610f4ccbcb19438cbce5d84bd376010596 (diff) | |
Define download_images.sh and check_os.sh as scripts
It also updates all python scripts which call check_os.sh.
The former healthcheck.sh is removed.
No shell script must be executable in git.
Change-Id: If4e8deb50ebd635a9091e3bb79ef61c07b9660dc
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
Diffstat (limited to 'functest/ci/prepare_env.py')
| -rwxr-xr-x | functest/ci/prepare_env.py | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/functest/ci/prepare_env.py b/functest/ci/prepare_env.py index c633ef826..ae9d9537e 100755 --- a/functest/ci/prepare_env.py +++ b/functest/ci/prepare_env.py @@ -251,8 +251,7 @@ def update_db_url(): def verify_deployment(): print_separator() logger.info("Verifying OpenStack services...") - cmd = ("%s" % pkg_resources.resource_filename( - 'functest', 'ci/check_os.sh')) + cmd = "check_os.sh" logger.debug("Executing command: %s" % cmd) p = subprocess.Popen(cmd, stdout=subprocess.PIPE, shell=True) @@ -261,7 +260,7 @@ def verify_deployment(): line = p.stdout.readline().rstrip() if "ERROR" in line: logger.error(line) - raise Exception("Problem while running 'check_os.sh'.") + raise Exception("Problem while running '{}'.".format(cmd)) logger.info(line) |