From 5a4ba328c7fc882cf26bb16213eea211275865b8 Mon Sep 17 00:00:00 2001
From: chenhb <chen.haibing1@zte.com.cn>
Date: Fri, 3 Aug 2018 15:37:00 +0800
Subject: [PATCH] Fix coverage test

1. We should use the report in `cover` directory instead of `cover-master`.
2. simplify job definiton base on tox-cover.

Change-Id: Ic32d556b4e191c594384f7f604e4b4ff46ccf317
---
 .zuul.d/zuul.yaml                           |  6 +++---
 tests/ci/playbooks/post-rally-coverage.yaml | 15 ---------------
 2 files changed, 3 insertions(+), 18 deletions(-)
 delete mode 100644 tests/ci/playbooks/post-rally-coverage.yaml

diff --git a/.zuul.d/zuul.yaml b/.zuul.d/zuul.yaml
index 7c80e3eb..4f2edcc3 100644
--- a/.zuul.d/zuul.yaml
+++ b/.zuul.d/zuul.yaml
@@ -30,14 +30,14 @@
 
 - job:
     name: rally-tox-cover
-    parent: tox
+    parent: tox-cover
     description: |
       Run test for rally project.
 
       Uses tox with the ``cover`` environment.
     vars:
-      tox_envlist: cover
-    post-run: tests/ci/playbooks/post-rally-coverage.yaml
+      coverage_output_src: '{{ zuul.project.src_dir }}/cover/'
+      zuul_executor_dest: '{{ zuul.executor.log_root }}/coverage/'
 
 - project:
     check:
diff --git a/tests/ci/playbooks/post-rally-coverage.yaml b/tests/ci/playbooks/post-rally-coverage.yaml
deleted file mode 100644
index 80ef79dc..00000000
--- a/tests/ci/playbooks/post-rally-coverage.yaml
+++ /dev/null
@@ -1,15 +0,0 @@
-- hosts: all
-  tasks:
-
-    - name: Put coverage report in the right place
-      synchronize:
-        src: "{{ zuul.projects['git.openstack.org/openstack/rally-openstack'].src_dir }}/cover-master/"
-        dest: '{{ zuul.executor.log_root }}/coverage/'
-        mode: pull
-        copy_links: true
-        verify_host: true
-        rsync_opts:
-          - --include=/**
-          - --include=*/
-          - --exclude=*
-          - --prune-empty-dirs