Merge "Fix tempest container post logging"

roles/validate-tempest/tasks/stackviz.yml

@@ -13,14 +13,6 @@
     tempest_dstat_opt: '--dstat /var/log/extra/dstat-csv.log'
   when: dstat_result.stat.exists
 
-- name: Set the proper permission for tempest directory and files
-  file:
-    dest: "{{ working_dir }}/tempest"
-    owner: "{{ undercloud_user }}"
-    group: "{{ undercloud_user }}"
-    recurse: true
-  become: true
-
 - name: Copy stackviz static file to home directory
   shell: >
     cp -r "{{ working_dir }}/tempest/.stackviz/share/stackviz-html" "{{ working_dir }}/stackviz"

roles/validate-tempest/tasks/tempest-results.yml

@@ -1,6 +1,21 @@
 ---
 - ignore_errors: true
+  when: tempest_format == 'container'
   block:
+    - name: Set the proper permission for tempest directory and files
+      file:
+        dest: "/var/lib/tempestdata"
+        owner: "{{ undercloud_user }}"
+        group: "{{ undercloud_user }}"
+        recurse: true
+      become: true
+
+    - name: copy files from tempest container to home directory
+      copy:
+        src: "/var/lib/tempestdata/tempest"
+        dest: "{{ working_dir }}"
+
+- block:
     - name: Check for .stestr directory
       stat:
         path: "{{ working_dir }}/tempest/.stestr"

roles/validate-tempest/templates/run-tempest.sh.j2

@@ -97,11 +97,5 @@ sudo $CONTAINER_BINARY run --net=host -i -v $TEMPEST_HOST_DATA:{{ tempest_data }
     {{ tempest_container_registry }}/{{ tempest_container_namespace }}:{{ tempest_container_tag }} \
     /usr/bin/bash -c 'set -e; {{ tempest_data }}/tempest_container.sh'
 
-# Change permission of tempest workspace directory
-sudo chmod -R 777 $TEMPEST_HOST_DATA
-
-# Copy tempest related data to tempest folder so that stackviz can use it
-cp -R $TEMPEST_HOST_DATA/tempest {{ working_dir }}
-
 {% endif %}
 ### --stop_docs