From: wu.zhihui <wu.zhihui1@zte.com.cn>
Date: Mon, 20 Mar 2017 04:13:23 +0000 (+0800)
Subject: update qtip validate jobs
X-Git-Tag: danube.1.0~116^2
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=51681f0225f4a7affc7746a729acc4d88b10a6c0;p=releng.git

update qtip validate jobs

- since zte pod2 is used for daisy, move qtip job to zte pod1
- add danube trigger

Change-Id: Id0bdc5e791d3ed33a4f48d46b51823672794d2dc
Signed-off-by: wu.zhihui <wu.zhihui1@zte.com.cn>
---

diff --git a/jjb/qtip/qtip-validate-jobs.yml b/jjb/qtip/qtip-validate-jobs.yml
index b8d2089d4..deaf525af 100644
--- a/jjb/qtip/qtip-validate-jobs.yml
+++ b/jjb/qtip/qtip-validate-jobs.yml
@@ -23,19 +23,22 @@
 # JOB VARIABLES
 #--------------------------------
     pod:
-        - zte-pod2:
+        - zte-pod1:
             installer: fuel
             <<: *master
         - zte-pod3:
             installer: fuel
             <<: *master
+        - zte-pod1:
+            installer: fuel
+            <<: *danube
         - zte-pod3:
             installer: fuel
             <<: *danube
     task:
         - daily:
             auto-builder-name: qtip-validate-deploy
-            auto-trigger-name: 'qtip-daily-{pod}-trigger'
+            auto-trigger-name: 'qtip-{pod}-daily-{stream}-trigger'
         - validate:
             auto-builder-name: qtip-validate-setup
             auto-trigger-name: gerrit-trigger-change-merged
@@ -136,11 +139,29 @@
 #---------
 
 - trigger:
-    name: qtip-daily-zte-pod2-trigger
+    name: 'qtip-zte-pod1-daily-master-trigger'
+    triggers:
+        - timed: '30 0 * * *'
+
+- trigger:
+    name: 'qtip-zte-pod3-daily-master-trigger'
+    triggers:
+        - timed: '30 0 * * *'
+
+- trigger:
+    name: 'qtip-zte-pod1-daily-danube-trigger'
     triggers:
         - timed: '0 7 * * *'
 
 - trigger:
-    name: qtip-daily-zte-pod3-trigger
+    name: 'qtip-zte-pod3-daily-danube-trigger'
     triggers:
-        - timed: '0 1 * * *'
+        - timed: '0 7 * * *'
+
+- trigger:
+    name: qtip-validate-trigger
+    triggers:
+        - gerrit-trigger-change-merged:
+            project: '{project}'
+            branch: '{branch}'
+            files: '**'