X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fqtip%2Fqtip-validate-jobs.yml;h=e64173ca77c3b04266f77665021b73b5b0033290;hb=ccd98e34b65d3273d2919e2aa7f90e8bfa8f89a2;hp=e1b71f516fb199f57337720b472ce3579975130b;hpb=1180ec3baaed69aac4927b33157d7e9be4584c6b;p=releng.git

diff --git a/jjb/qtip/qtip-validate-jobs.yml b/jjb/qtip/qtip-validate-jobs.yml
index e1b71f516..e64173ca7 100644
--- a/jjb/qtip/qtip-validate-jobs.yml
+++ b/jjb/qtip/qtip-validate-jobs.yml
@@ -13,48 +13,31 @@
         branch: '{stream}'
         gs-pathname: ''
         docker-tag: latest
-    danube: &danube
-        stream: danube
-        branch: 'stable/{stream}'
-        gs-pathname: '/{stream}'
-        docker-tag: 'stable'
 
 #--------------------------------
 # JOB VARIABLES
 #--------------------------------
-    pod:
-        - zte-pod1:
-            installer: fuel
-            scenario: os-odl_l2-nofeature-ha
+    qpi:
+        - compute:
+            installer: apex
+            pod: zte-pod4
             <<: *master
-        - zte-pod3:
-            installer: fuel
-            scenario: os-nosdn-kvm-ha
+        - storage:
+            installer: apex
+            pod: zte-pod4
             <<: *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
 
 #--------------------------------
 # JOB LIST
 #--------------------------------
     jobs:
-        - 'qtip-{scenario}-{pod}-daily-{stream}'
+        - 'qtip-{qpi}-{installer}-{stream}'
 
 ################################
 # job templates
 ################################
 - job-template:
-    name: 'qtip-{scenario}-{pod}-daily-{stream}'
+    name: 'qtip-{qpi}-{installer}-{stream}'
     disabled: false
     parameters:
         - project-parameter:
@@ -64,7 +47,7 @@
         - '{pod}-defaults'
         - string:
             name: DEPLOY_SCENARIO
-            default: '{scenario}'
+            default: generic
         - string:
             name: DOCKER_TAG
             default: '{docker-tag}'
@@ -73,16 +56,22 @@
             name: CI_DEBUG
             default: 'false'
             description: "Show debug output information"
+        - string:
+            name: TEST_SUITE
+            default: '{qpi}'
     scm:
         - git-scm
     triggers:
-        - 'qtip-{scenario}-{pod}-daily-{stream}-trigger'
+        - 'qtip-daily'
     builders:
         - description-setter:
             description: "POD: $NODE_NAME"
-        - qtip-validate-deploy
+        - shell: |
+            #!/bin/bash
+            source tests/ci/periodic.sh
     publishers:
         - qtip-common-publishers
+        - email-jenkins-admins-on-failure
 
 ################
 # MARCOS
@@ -91,13 +80,6 @@
 #---------
 # builder
 #---------
-- builder:
-    name: qtip-validate-deploy
-    builders:
-        - shell:
-            !include-raw: ./helpers/validate-deploy.sh
-        - shell:
-            !include-raw: ./helpers/cleanup-deploy.sh
 
 #-----------
 # parameter
@@ -118,26 +100,6 @@
 #---------
 
 - 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'
+    name: 'qtip-daily'
     triggers:
         - timed: '0 15 * * *'
-
-- trigger:
-    name: 'qtip-os-odl_l2-nofeature-ha-zte-pod1-daily-danube-trigger'
-    triggers:
-        - timed: '0 7 * * *'
-
-- trigger:
-    name: 'qtip-os-nosdn-kvm-ha-zte-pod3-daily-danube-trigger'
-    triggers:
-        - timed: '0 7 * * *'
-
-- trigger:
-    name: 'qtip-os-nosdn-nofeature-ha-zte-pod3-daily-danube-trigger'
-    triggers:
-        - timed: '30 0 * * *'