From fbe74663623c660dea5f334805f2660165165684 Mon Sep 17 00:00:00 2001
From: mandeepdhiman123 <mandeep.kumar@technoforte.co.in>
Date: Fri, 21 Aug 2020 10:36:20 +0530
Subject: [PATCH] Basic project structure

---
 mosip-security-playbook/group_vars/all.yml    |  2 +-
 .../functional-test-setup/tasks/main.yml      | 24 +++++++++----------
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/mosip-security-playbook/group_vars/all.yml b/mosip-security-playbook/group_vars/all.yml
index 66c1d36..97217db 100644
--- a/mosip-security-playbook/group_vars/all.yml
+++ b/mosip-security-playbook/group_vars/all.yml
@@ -20,7 +20,7 @@ tools_dir: '/home/mosipuser/securitytools/'
 #Robo framework variables
 root_dir: '/home/mosipuser/'
 zap_dir: '{{tools_dir}}/zap/'
-testrig_dir: '{{tools_dir}}/testrig'
+testrig_dir: '{{tools_dir}}/mosip-functional-tests-{{ testrig_version }}'
 report_dir: '/home/mosipuser/reports/'
 target_name: 'Mosip'
 target_uri: 'https://qa.mosip.net/'
diff --git a/mosip-security-playbook/roles/base-setup/functional-test-setup/tasks/main.yml b/mosip-security-playbook/roles/base-setup/functional-test-setup/tasks/main.yml
index 97afee0..464bd47 100644
--- a/mosip-security-playbook/roles/base-setup/functional-test-setup/tasks/main.yml
+++ b/mosip-security-playbook/roles/base-setup/functional-test-setup/tasks/main.yml
@@ -1,23 +1,14 @@
-- name: Download and Unarchive Functional Test
-  unarchive:
-    src: "https://github.com/mosip/mosip-functional-tests/archive/{{ testrig_version }}.zip"
-    dest: "{{ tools_dir }}"
-    remote_src: yes
-
 - name: Check testrig directory.
   stat:
-    path: "{{ tools_dir }}/testrig"
+    path: "{{ testrig_dir }}"
   register: testrig_folder
 
 - name: "Delete directory if already exists"
   file:
-    path: "{{ tools_dir }}/testrig"
+    path: "{{ testrig_dir }}"
     state: absent
   when: testrig_folder.stat.exists == true
 
-- name: Move versioned testrig to generic dir
-  command: "mv {{ tools_dir }}/mosip-functional-tests-{{ testrig_version }} {{ testrig_dir }}"
-
 - name: Update maven repository with settings file
   copy:
     src: "{{ item }}"
@@ -25,8 +16,17 @@
   with_fileglob:
     - "{{ utils_dir }}/settings.xml"
 
+- name: Download and Unarchive Functional Test
+  unarchive:
+    src: "https://github.com/mosip/mosip-functional-tests/archive/{{ testrig_version }}.zip"
+    dest: "{{ tools_dir }}"
+    remote_src: yes
+
+#- name: Move versioned testrig to generic dir
+#  command: "mv {{ tools_dir }}/mosip-functional-tests-{{ testrig_version }} {{ testrig_dir }}"
+
 - name: Bulding partner demo service for dependency
-  shell: "cd {{ tools_dir }}testrig/authentication-partnerdemo-service/ && mvn clean install"
+  shell: "cd {{ testrig_dir }}/authentication-partnerdemo-service/ && mvn clean install"
 
 - name: Bulding test-rig
   shell: "cd {{ testrig_dir }}/automationtests && mvn clean install"