functest: Move run-functest.sh execution out of ansible

Ansible throws out the log at the end of task execution which
makes it hard to read. This change renames the role to prepare-functest
and then takes the script execution out which will be executed by
releng/jjb/xci/xci-run-functest.sh.

Change-Id: Icf399ce4f04357814ed7109cd11113a9decddc50
Signed-off-by: Fatih Degirmenci <fdegir@gmail.com>

diff --git a/xci/playbooks/run-functest.yml b/xci/playbooks/prepare-functest.yml
similarity index 87%
rename from xci/playbooks/run-functest.yml
rename to xci/playbooks/prepare-functest.yml
index 8b3b29a..6d5b01c 100644 (file)
--- a/xci/playbooks/run-functest.yml
+++ b/xci/playbooks/prepare-functest.yml
@@ -13,8 +13,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-- name: Prepare the environment for functest and run tests
+- name: Prepare the environment for functest
   hosts: opnfv
   user: root
   roles:
-    - role: "run-functest"
+    - role: "prepare-functest"

diff --git a/xci/playbooks/roles/.gitignore b/xci/playbooks/roles/.gitignore
index 5e72578..e0b4777 100644 (file)
--- a/xci/playbooks/roles/.gitignore
+++ b/xci/playbooks/roles/.gitignore
@@ -3,6 +3,6 @@
 !clone-repository/
 !configure-network/
 !configure-nfs/
-!run-functest/
+!prepare-functest/
 !remote-folders/
 !synchronize-time/

diff --git a/xci/playbooks/roles/run-functest/defaults/main.yml b/xci/playbooks/roles/prepare-functest/defaults/main.yml
similarity index 100%
rename from xci/playbooks/roles/run-functest/defaults/main.yml
rename to xci/playbooks/roles/prepare-functest/defaults/main.yml

diff --git a/xci/playbooks/roles/run-functest/tasks/main.yml b/xci/playbooks/roles/prepare-functest/tasks/main.yml
similarity index 94%
rename from xci/playbooks/roles/run-functest/tasks/main.yml
rename to xci/playbooks/roles/prepare-functest/tasks/main.yml
index 3dc8e0b..243358f 100644 (file)
--- a/xci/playbooks/roles/run-functest/tasks/main.yml
+++ b/xci/playbooks/roles/prepare-functest/tasks/main.yml
@@ -34,6 +34,3 @@
     state: present
   with_items:
     - wget
-
-- name: execute the script
-  shell: "/root/run-functest.sh"

diff --git a/xci/playbooks/roles/run-functest/templates/env.j2 b/xci/playbooks/roles/prepare-functest/templates/env.j2
similarity index 100%
rename from xci/playbooks/roles/run-functest/templates/env.j2
rename to xci/playbooks/roles/prepare-functest/templates/env.j2

diff --git a/xci/playbooks/roles/run-functest/templates/run-functest.sh.j2 b/xci/playbooks/roles/prepare-functest/templates/run-functest.sh.j2
similarity index 100%
rename from xci/playbooks/roles/run-functest/templates/run-functest.sh.j2
rename to xci/playbooks/roles/prepare-functest/templates/run-functest.sh.j2