From 725035ec9441c0b05824a285ebf88a0b1376c9a5 Mon Sep 17 00:00:00 2001
From: jkilpatr <jkilpatr@redhat.com>
Date: Tue, 17 Jan 2017 07:16:06 -0500
Subject: [PATCH] Have Browbeat gather metadata for oooq

So in Joe's recent metadata commit he added a test
for regather, while this test works it does run the
entire benchmark twice, which isn't exactly ideal.
*stares at 22h old Newton build* this commit instead
stops gathering metadata as a seperate role and simply
runs Browbeat without gathering metadata, doing the same
test without taking twice the time.

Change-Id: I611c23ea683d167806f4ab88cbad93549c4dec87
---
 .../oooq/baremetal-virt-undercloud-tripleo-browbeat.yml  | 1 -
 ansible/oooq/quickstart-browbeat.yml                     | 1 -
 ansible/oooq/roles/browbeat-run/tasks/main.yml           | 9 ---------
 3 files changed, 11 deletions(-)

diff --git a/ansible/oooq/baremetal-virt-undercloud-tripleo-browbeat.yml b/ansible/oooq/baremetal-virt-undercloud-tripleo-browbeat.yml
index 2d689108d..ba8971683 100644
--- a/ansible/oooq/baremetal-virt-undercloud-tripleo-browbeat.yml
+++ b/ansible/oooq/baremetal-virt-undercloud-tripleo-browbeat.yml
@@ -30,7 +30,6 @@
   hosts: undercloud
   roles:
     - browbeat/collectd
-    - browbeat/gather-metadata
     - browbeat/bug-check
     - browbeat/grafana-dashboard-setup
     - browbeat/browbeat-run
diff --git a/ansible/oooq/quickstart-browbeat.yml b/ansible/oooq/quickstart-browbeat.yml
index 4b90e4bb7..882199a17 100644
--- a/ansible/oooq/quickstart-browbeat.yml
+++ b/ansible/oooq/quickstart-browbeat.yml
@@ -21,7 +21,6 @@
   hosts: undercloud
   roles:
     - browbeat/collectd
-    - browbeat/gather-metadata
     - browbeat/bug-check
     - browbeat/grafana-dashboard-setup
     - browbeat/browbeat-run
diff --git a/ansible/oooq/roles/browbeat-run/tasks/main.yml b/ansible/oooq/roles/browbeat-run/tasks/main.yml
index cd71b77d7..6dd2c197d 100644
--- a/ansible/oooq/roles/browbeat-run/tasks/main.yml
+++ b/ansible/oooq/roles/browbeat-run/tasks/main.yml
@@ -5,12 +5,3 @@
     "source {{ ansible_env.HOME }}/browbeat-venv/bin/activate; \
      cd {{ ansible_env.HOME }}/browbeat/; \
      python browbeat.py rally > {{ ansible_env.HOME }}/browbeat/results/browbeat_run.log"
-
-- name: Run Browbeat Test Regather
-  shell:
-    "source {{ ansible_env.HOME }}/browbeat-venv/bin/activate; \
-     cd {{ ansible_env.HOME }}/browbeat/; \
-     rm metadata/software-metadata.json; \
-     rm metadata/hardware-metadata.json; \
-     rm metadata/environment-metadata.json; \
-     python browbeat.py rally > {{ ansible_env.HOME }}/browbeat/results/browbeat_run.log"