From 33f30eb58a25a365cf8d4498cfefb29b0bc77c76 Mon Sep 17 00:00:00 2001 From: jkilpatr Date: Thu, 26 Jan 2017 09:46:27 -0500 Subject: [PATCH] Revert making log and results directory Reverting Commit: 2ba6da9022491315cd0d5c21dc502adbed20860f This needed much more testing before merging, my bad. I strongly suggest we don't add this functionality in a seperate commit again, it doesn't make sense to reorg and test all of this and then the pip commit right after. Just add it's functionality there. Change-Id: Iee7aa439fbc077c3c71f67b625b67fc55a86f199 --- .../roles/pre-install-setup/tasks/main.yml | 3 --- .../templates/browbeat-api-ci.yaml.j2 | 3 +-- .../templates/browbeat-basic.yaml.j2 | 3 +-- browbeat-complete.yaml | 3 +-- browbeat-config.yaml | 3 +-- browbeat.py | 18 ++++++------------ ci-scripts/config/browbeat-ci.yaml | 3 +-- lib/Tools.py | 17 ----------------- lib/validate.yaml | 3 --- log/.gitignore | 4 ++++ results/.gitignore | 4 ++++ 11 files changed, 19 insertions(+), 45 deletions(-) create mode 100644 log/.gitignore create mode 100644 results/.gitignore diff --git a/ansible/oooq/roles/pre-install-setup/tasks/main.yml b/ansible/oooq/roles/pre-install-setup/tasks/main.yml index 294842195..0e7cc0c88 100644 --- a/ansible/oooq/roles/pre-install-setup/tasks/main.yml +++ b/ansible/oooq/roles/pre-install-setup/tasks/main.yml @@ -44,6 +44,3 @@ - name: Install Ansible pip: name=ansible state=present become: true - -- name: Make results directory - file: "path={{ ansible_env.HOME }}/browbeat/results state=directory" diff --git a/ansible/oooq/roles/pre-install-setup/templates/browbeat-api-ci.yaml.j2 b/ansible/oooq/roles/pre-install-setup/templates/browbeat-api-ci.yaml.j2 index 8ea4c8b37..95f6da911 100644 --- a/ansible/oooq/roles/pre-install-setup/templates/browbeat-api-ci.yaml.j2 +++ b/ansible/oooq/roles/pre-install-setup/templates/browbeat-api-ci.yaml.j2 @@ -1,8 +1,7 @@ browbeat: - results : "$HOME/browbeat/results" + results : results/ rerun: 3 cloud_name: {{ browbeat_cloud_name }} - log : "$HOME/browbeat/log" elasticsearch: enabled: {{ elastic_enabled_template }} host: {{ elastic_host_template }} diff --git a/ansible/oooq/roles/pre-install-setup/templates/browbeat-basic.yaml.j2 b/ansible/oooq/roles/pre-install-setup/templates/browbeat-basic.yaml.j2 index dc84ba43a..4af309694 100644 --- a/ansible/oooq/roles/pre-install-setup/templates/browbeat-basic.yaml.j2 +++ b/ansible/oooq/roles/pre-install-setup/templates/browbeat-basic.yaml.j2 @@ -1,10 +1,9 @@ # Tests to be compleated for the install-and-check.sh script minimal and short workloads are performed # to confirm functionality. browbeat: - results : "$HOME/browbeat/results" + results : results/ rerun: 1 cloud_name: {{ browbeat_cloud_name }} - log : "$HOME/browbeat/log" elasticsearch: enabled: {{ elastic_enabled_template }} host: {{ elastic_host_template }} diff --git a/browbeat-complete.yaml b/browbeat-complete.yaml index 1472d75b5..9acac75d1 100644 --- a/browbeat-complete.yaml +++ b/browbeat-complete.yaml @@ -1,9 +1,8 @@ # Complete set of Stress Tests, this can take a long time (day(s)) browbeat: - results : "$HOME/.browbeat/results/" + results : results/ rerun: 3 cloud_name: openstack - log : "$HOME/.browbeat/log/" elasticsearch: enabled: false host: 1.1.1.1 diff --git a/browbeat-config.yaml b/browbeat-config.yaml index 53af5a8a1..f767c1c37 100644 --- a/browbeat-config.yaml +++ b/browbeat-config.yaml @@ -1,9 +1,8 @@ # Basic set of initial stress tests to test overcloud before running complete set of benchmarks. browbeat: - results : "$HOME/.browbeat/results" + results : results/ rerun: 1 cloud_name: openstack - log: "$HOME/.browbeat/log" elasticsearch: enabled: true host: 1.1.1.1 diff --git a/browbeat.py b/browbeat.py index 1adc34c85..39fdf059b 100755 --- a/browbeat.py +++ b/browbeat.py @@ -26,10 +26,10 @@ import os _workload_opts = ['perfkit', 'rally', 'shaker'] _config_file = 'browbeat-config.yaml' +debug_log_file = 'log/debug.log' def main(): tools = lib.Tools.Tools() - parser = argparse.ArgumentParser( description="Browbeat Performance and Scale testing for Openstack") parser.add_argument( @@ -47,14 +47,7 @@ def main(): _logger.setLevel(logging.DEBUG) _formatter = logging.Formatter('%(asctime)s - %(name)s - %(levelname)7s - %(message)s') _formatter.converter = time.gmtime - - # Load Browbeat yaml config file: - _config = tools._load_config(_cli_args.setup) - debug_log_path = tools.sub_env_vars(_config['browbeat']['log']) - # create log dir during run time - if not os.path.exists(debug_log_path): - os.makedirs(debug_log_path) - _dbg_file = logging.FileHandler(os.path.join(debug_log_path, 'debug.log')) + _dbg_file = logging.FileHandler(debug_log_file) _dbg_file.setLevel(logging.DEBUG) _dbg_file.setFormatter(_formatter) _ch = logging.StreamHandler() @@ -68,6 +61,9 @@ def main(): _logger.debug("CLI Args: {}".format(_cli_args)) + # Load Browbeat yaml config file: + _config = tools._load_config(_cli_args.setup) + # Default to all workloads if _cli_args.workloads == []: _cli_args.workloads.append('all') @@ -106,10 +102,8 @@ def main(): _cli_args.setup)) else: _logger.error("{} is missing in {}".format(wkld_provider, _cli_args.setup)) - result_dir = tools.sub_env_vars(_config['browbeat']['results']) + result_dir = _config['browbeat']['results'] lib.WorkloadBase.WorkloadBase.print_report(result_dir, time_stamp) - if not os.path.exists(result_dir): - os.makedirs(result_dir) _logger.info("Saved browbeat result summary to {}".format( os.path.join(result_dir,time_stamp + '.' + 'report'))) lib.WorkloadBase.WorkloadBase.print_summary() diff --git a/ci-scripts/config/browbeat-ci.yaml b/ci-scripts/config/browbeat-ci.yaml index e1807a5aa..eeb08519f 100644 --- a/ci-scripts/config/browbeat-ci.yaml +++ b/ci-scripts/config/browbeat-ci.yaml @@ -1,10 +1,9 @@ # Tests to be compleated for the install-and-check.sh script minimal and short workloads are performed # to confirm functionality. browbeat: - results : "$HOME/.browbeat/results" + results : results/ rerun: 1 cloud_name: openstack - log: "$HOME/.browbeat/log" elasticsearch: enabled: false host: 1.1.1.1 diff --git a/lib/Tools.py b/lib/Tools.py index 09fd4a423..39b2afcb5 100644 --- a/lib/Tools.py +++ b/lib/Tools.py @@ -126,20 +126,3 @@ class Tools(object): else: self.logger.info("Metadata about cloud has been gathered") return True - - # Takes a string with $FOO and returns a string - # with those variables replaced with their env paths. - def sub_env_vars(self, path): - path_list = path.split('/') - new_path = [] - for item in path_list: - if item.startswith('$'): - var = item.translate(None, '$') - replacement = os.environ[var] - if replacement is None: - new_path.extend(item + "/") - else: - new_path.extend(replacement + "/") - else: - new_path.extend(item + "/") - return ''.join(new_path) diff --git a/lib/validate.yaml b/lib/validate.yaml index fd89ee759..c41fc5fc9 100644 --- a/lib/validate.yaml +++ b/lib/validate.yaml @@ -15,9 +15,6 @@ mapping: cloud_name: type: str required: True - log: - type: str - required: True elasticsearch: required: True diff --git a/log/.gitignore b/log/.gitignore new file mode 100644 index 000000000..5e7d2734c --- /dev/null +++ b/log/.gitignore @@ -0,0 +1,4 @@ +# Ignore everything in this directory +* +# Except this file +!.gitignore diff --git a/results/.gitignore b/results/.gitignore new file mode 100644 index 000000000..5e7d2734c --- /dev/null +++ b/results/.gitignore @@ -0,0 +1,4 @@ +# Ignore everything in this directory +* +# Except this file +!.gitignore