X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fqtip%2Fqtip-validate-jobs.yml;h=d9d3e72e6d96e8c5158cb693bff3052196eed4c5;hb=e47b91acf5b085fcc87a8b962a36292726e3e516;hp=73d7993c9d297ef4b1adaac1897bcaeee6ff0f05;hpb=3aa5396e6d56712c1738754f0233d4d7b8bba40c;p=releng.git

diff --git a/jjb/qtip/qtip-validate-jobs.yml b/jjb/qtip/qtip-validate-jobs.yml
index 73d7993c9..d9d3e72e6 100644
--- a/jjb/qtip/qtip-validate-jobs.yml
+++ b/jjb/qtip/qtip-validate-jobs.yml
@@ -1,3 +1,4 @@
+---
 #######################
 # validate after MERGE
 #######################
@@ -5,109 +6,134 @@
     name: qtip
     project: qtip
 
-#--------------------------------
-# BRANCH ANCHORS
-#--------------------------------
+    # -------------------------------
+    # BRANCH ANCHORS
+    # -------------------------------
     master: &master
-        stream: master
-        branch: '{stream}'
-        gs-pathname: ''
-        docker-tag: latest
-
-#--------------------------------
-# JOB VARIABLES
-#--------------------------------
-    pod:
-        - zte-pod1:
-            installer: fuel
-            scenario: os-odl_l2-nofeature-ha
-            <<: *master
-        - zte-pod3:
-            installer: fuel
-            scenario: os-nosdn-kvm-ha
-            <<: *master
-
-#--------------------------------
-# JOB LIST
-#--------------------------------
+      stream: master
+      branch: '{stream}'
+      gs-pathname: ''
+      docker-tag: latest
+    euphrates: &euphrates
+      stream: euphrates
+      branch: 'stable/{stream}'
+      gs-pathname: '{stream}'
+      docker-tag: 'stable'
+
+    # -------------------------------
+    # JOB VARIABLES
+    # -------------------------------
+    qpi:
+      - compute:
+          installer: apex
+          pod: zte-virtual5
+          <<: *master
+      - storage:
+          installer: apex
+          pod: zte-virtual5
+          <<: *master
+      - compute:
+          installer: apex
+          pod: zte-virtual5
+          <<: *euphrates
+      - storage:
+          installer: apex
+          pod: zte-virtual5
+          <<: *euphrates
+      - compute:
+          installer: fuel
+          pod: zte-virtual6
+          <<: *master
+
+    # -------------------------------
+    # JOB LIST
+    # -------------------------------
     jobs:
-        - 'qtip-{scenario}-{pod}-daily-{stream}'
+      - 'qtip-{qpi}-{installer}-{pod}-{stream}'
 
 ################################
 # job templates
 ################################
 - job-template:
-    name: 'qtip-{scenario}-{pod}-daily-{stream}'
+    name: 'qtip-{qpi}-{installer}-{pod}-{stream}'
     disabled: false
+
     parameters:
-        - project-parameter:
-            project: '{project}'
-            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"
+      - project-parameter:
+          project: '{project}'
+          branch: '{branch}'
+      - '{installer}-defaults'
+      - '{pod}-defaults'
+      - string:
+          name: DEPLOY_SCENARIO
+          default: generic
+      - string:
+          name: DOCKER_TAG
+          default: '{docker-tag}'
+          description: 'Tag to pull docker image'
+      - string:
+          name: CI_DEBUG
+          default: 'false'
+          description: "Show debug output information"
+      - string:
+          name: TEST_SUITE
+          default: '{qpi}'
+      - string:
+          name: TESTAPI_URL
+          default: 'http://testresults.opnfv.org/test/api/v1'
+      - string:
+          name: OPNFV_RELEASE
+          default: '{stream}'
     scm:
-        - git-scm
+      - git-scm
+
+    wrappers:
+      - timeout:
+          timeout: 30
+          abort: true
+      - timestamps
+
     triggers:
-        - 'qtip-{scenario}-{pod}-daily-{stream}-trigger'
+      - 'qtip-daily'
+
     builders:
-        - description-setter:
-            description: "POD: $NODE_NAME"
-        - qtip-validate-deploy
+      - description-setter:
+          description: "POD: $NODE_NAME"
+      - shell: |
+          #!/bin/bash
+          source tests/ci/periodic.sh
+
     publishers:
-        - qtip-common-publishers
-        - email-jenkins-admins-on-failure
+      - qtip-common-publishers
+      - email-jenkins-admins-on-failure
 
 ################
 # MARCOS
 ################
 
-#---------
+# --------
 # builder
-#---------
-- builder:
-    name: qtip-validate-deploy
-    builders:
-        - shell:
-            !include-raw: ./helpers/cleanup-deploy.sh
-        - shell:
-            !include-raw: ./helpers/validate-deploy.sh
-
+# --------
 
-#-----------
+# ----------
 # parameter
-#-----------
+# ----------
 
-#-----------
+# ----------
 # publisher
-#-----------
+# ----------
 
 - publisher:
     name: qtip-common-publishers
     publishers:
-        - email:
-            recipients: wu.zhihui1@zte.com.cn, zhang.yujunz@zte.com.cn
+      - email:
+          recipients: wu.zhihui1@zte.com.cn, zhang.yujunz@zte.com.cn
 
-#---------
+# --------
 # trigger
-#---------
-
-- 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 * * *'
+      - timed: '0 15 * * *'