X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fqtip%2Fqtip-validate-jobs.yml;h=8dd97de1d9734e6ae8845de592018310efe4e0b2;hb=1ddf73929477c06d3b0b09dfafe3f436e0d8bc08;hp=10ee72a8bbe7631e2d0e9828d0cd3847e44f1dc7;hpb=e0e8397f4fa90f168ec8a3a4a91980e033fea8f7;p=releng.git

diff --git a/jjb/qtip/qtip-validate-jobs.yml b/jjb/qtip/qtip-validate-jobs.yml
index 10ee72a8b..8dd97de1d 100644
--- a/jjb/qtip/qtip-validate-jobs.yml
+++ b/jjb/qtip/qtip-validate-jobs.yml
@@ -13,53 +13,74 @@
         branch: '{stream}'
         gs-pathname: ''
         docker-tag: latest
+    danube: &danube
+        stream: danube
+        branch: 'stable/{stream}'
+        gs-pathname: '/{stream}'
+        docker-tag: 'stable'
 
 #--------------------------------
 # JOB VARIABLES
 #--------------------------------
     pod:
-        - zte-pod2:
+        - zte-pod1:
             installer: fuel
+            scenario: os-odl_l2-nofeature-ha
             <<: *master
         - zte-pod3:
             installer: fuel
+            scenario: os-nosdn-kvm-ha
             <<: *master
-    task:
-        - daily:
-            auto-builder-name: qtip-validate-deploy
-            auto-trigger-name: 'qtip-daily-{pod}-trigger'
-        - validate:
-            auto-builder-name: qtip-validate-setup
-            auto-trigger-name: qtip-validate-trigger
-        - experimental:
-            auto-builder-name: qtip-validate-setup
-            auto-trigger-name: experimental
+        - 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
 
 #--------------------------------
 # 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:
-        - qtip-common-parameters:
+        - project-parameter:
             project: '{project}'
-            <<: *master
+            branch: '{branch}'
         - '{installer}-defaults'
         - '{pod}-defaults'
+        - string:
+            name: DEPLOY_SCENARIO
+            default: '{scenario}'
+        - string:
+            name: DOCKER_TAG
+            default: '{docker-tag}'
+            description: 'Tag to pull docker image'
+        - string:
+            name: CI_DEBUG
+            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
 
@@ -70,45 +91,19 @@
 #---------
 # builder
 #---------
-
-- builder:
-    name: qtip-common-builders
-    builders:
-        - description-setter:
-            description: "POD: $NODE_NAME"
-
 - builder:
     name: qtip-validate-deploy
     builders:
-        - shell:
-            !include-raw: ./helpers/validate-deploy.sh
         - shell:
             !include-raw: ./helpers/cleanup-deploy.sh
-
-- builder:
-    name: qtip-validate-setup
-    builders:
         - shell:
-            !include-raw: ./helpers/validate-setup.sh
+            !include-raw: ./helpers/validate-deploy.sh
+
 
 #-----------
 # parameter
 #-----------
 
-- parameter:
-    name: qtip-common-parameters
-    parameters:
-        - project-parameter:
-            project: '{project}'
-            branch: '{branch}'
-        - string:
-            name: DEPLOY_SCENARIO
-            default: 'os-nosdn-nofeature-ha'
-        - string:
-            name: DOCKER_TAG
-            default: '{docker-tag}'
-            description: 'Tag to pull docker image'
-
 #-----------
 # publisher
 #-----------
@@ -124,19 +119,26 @@
 #---------
 
 - trigger:
-    name: qtip-daily-zte-pod2-trigger
+    name: 'qtip-os-odl_l2-nofeature-ha-zte-pod1-daily-master-trigger'
+    triggers:
+        - timed: '0 15 * * *'
+
+- trigger:
+    name: 'qtip-os-nosdn-kvm-ha-zte-pod3-daily-master-trigger'
+    triggers:
+        - timed: '0 15 * * *'
+
+- trigger:
+    name: 'qtip-os-odl_l2-nofeature-ha-zte-pod1-daily-danube-trigger'
     triggers:
         - timed: '0 7 * * *'
 
 - trigger:
-    name: qtip-daily-zte-pod3-trigger
+    name: 'qtip-os-nosdn-kvm-ha-zte-pod3-daily-danube-trigger'
     triggers:
-        - timed: '0 1 * * *'
+        - 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 * * *'