From 1b838b4bd75f21e45e8a40407b1e3279dd5935d2 Mon Sep 17 00:00:00 2001 From: Cédric Ollivier Date: Fri, 30 Jun 2017 09:13:17 +0200 Subject: Define download_images.sh and check_os.sh as scripts MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 --- functest/ci/check_os.sh | 0 functest/ci/prepare_env.py | 5 ++--- 2 files changed, 2 insertions(+), 3 deletions(-) mode change 100755 => 100644 functest/ci/check_os.sh (limited to 'functest/ci') diff --git a/functest/ci/check_os.sh b/functest/ci/check_os.sh old mode 100755 new mode 100644 diff --git a/functest/ci/prepare_env.py b/functest/ci/prepare_env.py index c633ef82..ae9d9537 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) -- cgit 1.2.3-korg