From 325f0012af3b439ab8d124d89641f80a26598edb Mon Sep 17 00:00:00 2001
From: "wu.zhihui" <wu.zhihui1@zte.com.cn>
Date: Tue, 21 Mar 2017 15:44:16 +0800
Subject: [PATCH] [qtip]refactor validate job

- only keep the builder "qtip-validate-deploy", remove the others
- add scenario info in qtip-validate-jobs.yaml
- add some print info in validate-deploy.sh
- a related modification in fuel jjb file

Change-Id: Iff884f273eea5c6aac64e09cfffcedc7481b47e9
Signed-off-by: wu.zhihui <wu.zhihui1@zte.com.cn>
---
 jjb/fuel/fuel-daily-jobs.yml        |  2 +-
 jjb/qtip/helpers/validate-deploy.sh |  6 ++++
 jjb/qtip/qtip-validate-jobs.yml     | 62 ++++++++++++++-----------------------
 3 files changed, 30 insertions(+), 40 deletions(-)

diff --git a/jjb/fuel/fuel-daily-jobs.yml b/jjb/fuel/fuel-daily-jobs.yml
index b65b2c0dd..12456ddbb 100644
--- a/jjb/fuel/fuel-daily-jobs.yml
+++ b/jjb/fuel/fuel-daily-jobs.yml
@@ -1112,7 +1112,7 @@
 - trigger:
     name: 'fuel-os-nosdn-nofeature-ha-zte-pod3-daily-danube-trigger'
     triggers:
-        - timed: ''
+        - timed: '0 18 * * *'
 - trigger:
     name: 'fuel-os-odl_l2-nofeature-ha-zte-pod3-daily-danube-trigger'
     triggers:
diff --git a/jjb/qtip/helpers/validate-deploy.sh b/jjb/qtip/helpers/validate-deploy.sh
index 90b54a1c9..a73e33c2c 100644
--- a/jjb/qtip/helpers/validate-deploy.sh
+++ b/jjb/qtip/helpers/validate-deploy.sh
@@ -12,6 +12,12 @@ envs="INSTALLER_TYPE=${INSTALLER_TYPE} -e INSTALLER_IP=${INSTALLER_IP}
 -e NODE_NAME=${NODE_NAME} -e CI_DEBUG=${CI_DEBUG}"
 dir_imgstore="${HOME}/imgstore"
 
+echo "--------------------------------------------------------"
+echo "POD: $NODE_NAME"
+echo "INSTALLER: $INSTALLER_TYPE"
+echo "Scenario: $DEPLOY_SCENARIO"
+echo "--------------------------------------------------------"
+
 echo "Qtip: Pulling docker image: opnfv/qtip:${DOCKER_TAG}"
 docker pull opnfv/qtip:$DOCKER_TAG
 
diff --git a/jjb/qtip/qtip-validate-jobs.yml b/jjb/qtip/qtip-validate-jobs.yml
index 80b08e6a3..413abf012 100644
--- a/jjb/qtip/qtip-validate-jobs.yml
+++ b/jjb/qtip/qtip-validate-jobs.yml
@@ -25,38 +25,36 @@
     pod:
         - zte-pod1:
             installer: fuel
+            scenario: os-odl_l2-nofeature-ha
             <<: *master
         - zte-pod3:
             installer: fuel
+            scenario: os-nosdn-kvm-ha
             <<: *master
         - zte-pod1:
             installer: fuel
+            scenario: os-odl_l2-nofeature-ha
             <<: *danube
         - zte-pod3:
             installer: fuel
+            scenario: os-nosdn-nofeature-ha
+            <<: *danube
+        - zte-pod3:
+            installer: fuel
+            scenario: os-nosdn-kvm-ha
             <<: *danube
-    task:
-        - daily:
-            auto-builder-name: qtip-validate-deploy
-            auto-trigger-name: 'qtip-{pod}-daily-{stream}-trigger'
-        - validate:
-            auto-builder-name: qtip-validate-setup
-            auto-trigger-name: gerrit-trigger-change-merged
-        - experimental:
-            auto-builder-name: qtip-validate-setup
-            auto-trigger-name: experimental
 
 #--------------------------------
 # JOB LIST
 #--------------------------------
     jobs:
-        - 'qtip-{task}-{installer}-{pod}-{stream}'
+        - 'qtip-{scenario}-{pod}-daily-{stream}'
 
 ################################
 # job templates
 ################################
 - job-template:
-    name: 'qtip-{task}-{installer}-{pod}-{stream}'
+    name: 'qtip-{scenario}-{pod}-daily-{stream}'
     disabled: false
     parameters:
         - project-parameter:
@@ -66,7 +64,7 @@
         - '{pod}-defaults'
         - string:
             name: DEPLOY_SCENARIO
-            default: 'os-nosdn-nofeature-ha'
+            default: '{scenario}'
         - string:
             name: DOCKER_TAG
             default: '{docker-tag}'
@@ -78,10 +76,11 @@
     scm:
         - git-scm
     triggers:
-        - '{auto-trigger-name}'
+        - 'qtip-{scenario}-{pod}-daily-{stream}-trigger'
     builders:
-        - qtip-common-builders
-        - '{auto-builder-name}'
+        - description-setter:
+            description: "POD: $NODE_NAME"
+        - qtip-validate-deploy
     publishers:
         - qtip-common-publishers
 
@@ -92,12 +91,6 @@
 #---------
 # builder
 #---------
-- builder:
-    name: qtip-common-builders
-    builders:
-        - description-setter:
-            description: "POD: $NODE_NAME"
-
 - builder:
     name: qtip-validate-deploy
     builders:
@@ -106,12 +99,6 @@
         - shell:
             !include-raw: ./helpers/cleanup-deploy.sh
 
-- builder:
-    name: qtip-validate-setup
-    builders:
-        - shell:
-            !include-raw: ./helpers/validate-setup.sh
-
 #-----------
 # parameter
 #-----------
@@ -131,29 +118,26 @@
 #---------
 
 - trigger:
-    name: 'qtip-zte-pod1-daily-master-trigger'
+    name: 'qtip-os-odl_l2-nofeature-ha-zte-pod1-daily-master-trigger'
     triggers:
-        - timed: '30 0 * * *'
+        - timed: '0 15 * * *'
 
 - trigger:
-    name: 'qtip-zte-pod3-daily-master-trigger'
+    name: 'qtip-os-nosdn-kvm-ha-zte-pod3-daily-master-trigger'
     triggers:
-        - timed: '30 0 * * *'
+        - timed: '0 15 * * *'
 
 - trigger:
-    name: 'qtip-zte-pod1-daily-danube-trigger'
+    name: 'qtip-os-odl_l2-nofeature-ha-zte-pod1-daily-danube-trigger'
     triggers:
         - timed: '0 7 * * *'
 
 - trigger:
-    name: 'qtip-zte-pod3-daily-danube-trigger'
+    name: 'qtip-os-nosdn-kvm-ha-zte-pod3-daily-danube-trigger'
     triggers:
         - timed: '0 7 * * *'
 
 - trigger:
-    name: qtip-validate-trigger
+    name: 'qtip-os-nosdn-nofeature-ha-zte-pod3-daily-danube-trigger'
     triggers:
-        - gerrit-trigger-change-merged:
-            project: '{project}'
-            branch: '{branch}'
-            files: '**'
+        - timed: '30 0 * * *'
-- 
2.16.6