Merge "[qtip]refactor validate job"

diff --combined jjb/qtip/qtip-validate-jobs.yml
index a850d67,413abf0..e1b71f5
--- 1/jjb/qtip/qtip-validate-jobs.yml
--- 2/jjb/qtip/qtip-validate-jobs.yml
+++ b/jjb/qtip/qtip-validate-jobs.yml
@@@ -25,38 -25,36 +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,22 -64,23 +64,23 @@@
          - '{pod}-defaults'
          - string:
              name: DEPLOY_SCENARIO
-             default: 'os-nosdn-nofeature-ha'
+             default: '{scenario}'
          - string:
              name: DOCKER_TAG
              default: '{docker-tag}'
              description: 'Tag to pull docker image'
          - string:
              name: CI_DEBUG
 -            default: 'true'
 +            default: 'false'
              description: "Show debug output information"
      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 +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 +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 +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 * * *'