From b9bdeb4f5ca5c8caaaf813accb4f65cc23b9c9ee Mon Sep 17 00:00:00 2001 From: Ghanshyam Mann Date: Fri, 19 Jun 2020 15:27:42 -0500 Subject: [PATCH] Move process-stackviz role from Tempest to Devstack process-stackviz role currently defined in Tempest and used in tempest jobs. Issue with having it in branchless Tempest is that any fix in that role cannot be backported to older Tempest. Also stackviz is not Tempest things it is only used by Tempest jobs. Stackviz can be considered as a service similar to Tempest so inatlling it in Devstack side make sense. Also that will give us advantage to handle the branch specific fixes or backpoting the fixes. This can solve the current issues we are facing on rocky branch - https://zuul.opendev.org/t/openstack/build/c1e2da80537448bfb24331fb4198a931/console#4/0/29/controller Depends-On: https://review.opendev.org/#/c/737037/ Depends-On: https://review.opendev.org/#/c/737075/ Depends-On: https://review.opendev.org/#/c/737076/ Depends-On: https://review.opendev.org/#/c/737077/ Change-Id: Ide74cdf7967975fba9a3230007b35798d23e8bd2 --- roles/process-stackviz/README.rst | 22 ------- roles/process-stackviz/defaults/main.yaml | 3 - roles/process-stackviz/tasks/main.yaml | 70 ----------------------- 3 files changed, 95 deletions(-) delete mode 100644 roles/process-stackviz/README.rst delete mode 100644 roles/process-stackviz/defaults/main.yaml delete mode 100644 roles/process-stackviz/tasks/main.yaml diff --git a/roles/process-stackviz/README.rst b/roles/process-stackviz/README.rst deleted file mode 100644 index a8447d2355..0000000000 --- a/roles/process-stackviz/README.rst +++ /dev/null @@ -1,22 +0,0 @@ -Generate stackviz report. - -Generate stackviz report using subunit and dstat data, using -the stackviz archive embedded in test images. - -**Role Variables** - -.. zuul:rolevar:: devstack_base_dir - :default: /opt/stack - - The devstack base directory. - -.. zuul:rolevar:: stage_dir - :default: "{{ ansible_user_dir }}" - - The stage directory where the input data can be found and - the output will be produced. - -.. zuul:rolevar:: zuul_work_dir - :default: {{ devstack_base_dir }}/tempest - - Directory to work in. It has to be a fully qualified path. diff --git a/roles/process-stackviz/defaults/main.yaml b/roles/process-stackviz/defaults/main.yaml deleted file mode 100644 index f3bc32b149..0000000000 --- a/roles/process-stackviz/defaults/main.yaml +++ /dev/null @@ -1,3 +0,0 @@ -devstack_base_dir: /opt/stack -stage_dir: "{{ ansible_user_dir }}" -zuul_work_dir: "{{ devstack_base_dir }}/tempest" diff --git a/roles/process-stackviz/tasks/main.yaml b/roles/process-stackviz/tasks/main.yaml deleted file mode 100644 index e3a0a0e40d..0000000000 --- a/roles/process-stackviz/tasks/main.yaml +++ /dev/null @@ -1,70 +0,0 @@ -- name: Check if stackviz archive exists - stat: - path: "/opt/cache/files/stackviz-latest.tar.gz" - register: stackviz_archive - -- debug: - msg: "Stackviz archive could not be found in /opt/cache/files/stackviz-latest.tar.gz" - when: not stackviz_archive.stat.exists - -- name: Check if subunit data exists - stat: - path: "{{ zuul_work_dir }}/testrepository.subunit" - register: subunit_input - -- debug: - msg: "Subunit file could not be found at {{ zuul_work_dir }}/testrepository.subunit" - when: not subunit_input.stat.exists - -- name: Install stackviz - when: - - stackviz_archive.stat.exists - - subunit_input.stat.exists - block: - - include_role: - name: ensure-pip - - - pip: - name: "file://{{ stackviz_archive.stat.path }}" - virtualenv: /tmp/stackviz - virtualenv_command: '{{ ensure_pip_virtualenv_command }}' - extra_args: -U - -- name: Deploy stackviz static html+js - command: cp -pR /tmp/stackviz/share/stackviz-html {{ stage_dir }}/stackviz - when: - - stackviz_archive.stat.exists - - subunit_input.stat.exists - -- name: Check if dstat data exists - stat: - path: "{{ devstack_base_dir }}/logs/dstat-csv.log" - register: dstat_input - when: - - stackviz_archive.stat.exists - - subunit_input.stat.exists - -- name: Run stackviz with dstat - shell: | - cat {{ subunit_input.stat.path }} | \ - /tmp/stackviz/bin/stackviz-export \ - --dstat "{{ devstack_base_dir }}/logs/dstat-csv.log" \ - --env --stdin \ - {{ stage_dir }}/stackviz/data - when: - - stackviz_archive.stat.exists - - subunit_input.stat.exists - - dstat_input.stat.exists - failed_when: False - -- name: Run stackviz without dstat - shell: | - cat {{ subunit_input.stat.path }} | \ - /tmp/stackviz/bin/stackviz-export \ - --env --stdin \ - {{ stage_dir }}/stackviz/data - when: - - stackviz_archive.stat.exists - - subunit_input.stat.exists - - not dstat_input.stat.exists - failed_when: False