From 3b5a5e3f0d0a5f40ebc8bd6515d4ba2570f142e6 Mon Sep 17 00:00:00 2001
From: Alex Ermolov <aermolov@mirantis.com>
Date: Sat, 19 Mar 2016 21:45:11 +0300
Subject: [PATCH] jenkins: generalized jobs deployment

Change-Id: Id51ca910bd021e30ad3215a57955ee423e967fd3
---
 .../ansible => deploy}/install.yml            | 25 +++++++++----------
 .../ansible => deploy}/inventory-local.ini    |  0
 2 files changed, 12 insertions(+), 13 deletions(-)
 rename jenkins/{testing_automation/ansible => deploy}/install.yml (61%)
 rename jenkins/{testing_automation/ansible => deploy}/inventory-local.ini (100%)

diff --git a/jenkins/testing_automation/ansible/install.yml b/jenkins/deploy/install.yml
similarity index 61%
rename from jenkins/testing_automation/ansible/install.yml
rename to jenkins/deploy/install.yml
index cf3d82e..ac1ad8e 100644
--- a/jenkins/testing_automation/ansible/install.yml
+++ b/jenkins/deploy/install.yml
@@ -6,14 +6,19 @@
     rally_job_name: rally
     tempest_job_name: tempest
     patching_job_name: patch_environment
+    ta_subpath: testing_automation/ansible
 
   tasks:
 
-    - name: Rally | upload inventory
-      copy: src=inventory.ini dest={{ jobs_dir }}/{{ rally_job_name }}
+    - name: upload inventory
+      copy: src=../{{ ta_subpath }}/inventory.ini dest={{ jobs_dir }}/{{ item }}
+      with_items:
+        - "{{ rally_job_name }}"
+        - "{{ tempest_job_name }}"
+        - "{{ patching_job_name }}"
 
     - name: Rally | upload playbooks
-      copy: src=playbooks/{{ item }} dest={{ jobs_dir }}/{{ rally_job_name }}
+      copy: src=../{{ ta_subpath }}/playbooks/{{ item }} dest={{ jobs_dir }}/{{ rally_job_name }}
       with_items:
         - cleanup_test_vm.yml
         - common_vars.yml
@@ -25,7 +30,7 @@
       file: path={{ jobs_dir }}/{{ rally_job_name }}/contrib state=directory
 
     - name: Rally | upload contrib
-      copy: src=playbooks/contrib/{{ item }} dest={{ jobs_dir }}/{{ rally_job_name }}/contrib
+      copy: src=../{{ ta_subpath }}/playbooks/contrib/{{ item }} dest={{ jobs_dir }}/{{ rally_job_name }}/contrib
       with_items:
         - instance_dd_test.sh
         - openrc
@@ -34,11 +39,8 @@
         - template_ubuntu.xml
         - testing-network_pub.xml
 
-    - name: Tempest | upload inventory
-      copy: src=inventory.ini dest={{ jobs_dir }}/{{ tempest_job_name }}
-
     - name: Tempest | upload playbooks
-      copy: src=playbooks/{{ item }} dest={{ jobs_dir }}/{{ tempest_job_name }}
+      copy: src=../{{ ta_subpath }}/playbooks/{{ item }} dest={{ jobs_dir }}/{{ tempest_job_name }}
       with_items:
         - common_vars.yml
         - perform_tempest.yml
@@ -50,15 +52,12 @@
       file: path={{ jobs_dir }}/{{ tempest_job_name }}/contrib state=directory
 
     - name: Tempest | upload contrib
-      copy: src=playbooks/contrib/{{ item }} dest={{ jobs_dir }}/{{ tempest_job_name }}/contrib
+      copy: src=../{{ ta_subpath }}/playbooks/contrib/{{ item }} dest={{ jobs_dir }}/{{ tempest_job_name }}/contrib
       with_items:
         - tempest-tmux
 
-    - name: Patching | upload inventory
-      copy: src=inventory.ini dest={{ jobs_dir }}/{{ patching_job_name }}
-
     - name: Patching | upload playbooks
-      copy: src=playbooks/{{ item }} dest={{ jobs_dir }}/{{ patching_job_name }}
+      copy: src=../{{ ta_subpath }}/playbooks/{{ item }} dest={{ jobs_dir }}/{{ patching_job_name }}
       with_items:
         - common_vars.yml
         - patch_environment.yml
diff --git a/jenkins/testing_automation/ansible/inventory-local.ini b/jenkins/deploy/inventory-local.ini
similarity index 100%
rename from jenkins/testing_automation/ansible/inventory-local.ini
rename to jenkins/deploy/inventory-local.ini
-- 
2.45.2