Merge "Create Stable Branch Jobs for armband"

[releng.git] / jjb / qtip / qtip-validate-jobs.yml

diff --git a/jjb/qtip/qtip-validate-jobs.yml b/jjb/qtip/qtip-validate-jobs.yml
index cd77d0a..f20b321 100644 (file)
--- a/jjb/qtip/qtip-validate-jobs.yml
+++ b/jjb/qtip/qtip-validate-jobs.yml
@@ -14,8 +14,8 @@
       branch: '{stream}'
       gs-pathname: ''
       docker-tag: latest
-    euphrates: &euphrates
-      stream: euphrates
+    fraser: &fraser
+      stream: fraser
       branch: 'stable/{stream}'
       gs-pathname: '{stream}'
       docker-tag: 'stable'
@@ -26,32 +26,37 @@
     qpi:
       - compute:
           installer: apex
-          pod: zte-pod4
+          pod: zte-virtual5
+          sut: node
           <<: *master
       - storage:
           installer: apex
-          pod: zte-pod4
+          pod: zte-virtual5
+          sut: ''
           <<: *master
-      - compute:
-          installer: apex
-          pod: zte-pod4
-          <<: *euphrates
-      - storage:
+      - network:
           installer: apex
-          pod: zte-pod4
-          <<: *euphrates
+          pod: zte-virtual5
+          sut: ''
+          <<: *master
+      - compute:
+          installer: fuel
+          pod: zte-virtual6
+          sut: vnf
+          <<: *master
+
 
     # -------------------------------
     # JOB LIST
     # -------------------------------
     jobs:
-      - 'qtip-{qpi}-{installer}-{stream}'
+      - 'qtip-{qpi}-{installer}-{pod}-{stream}'
 
 ################################
 # job templates
 ################################
 - job-template:
-    name: 'qtip-{qpi}-{installer}-{stream}'
+    name: 'qtip-{qpi}-{installer}-{pod}-{stream}'
     disabled: false
 
     parameters:
@@ -80,15 +85,17 @@
       - string:
           name: OPNFV_RELEASE
           default: '{stream}'
+      - string:
+          name: SUT
+          description: "System Under Test"
+          default: '{sut}'
     scm:
       - git-scm
 
     wrappers:
       - timeout:
-          elastic-percentage: 150
-          elastic-default-timeout: 30
+          timeout: 120
           abort: true
-          type: elastic
       - timestamps
 
     triggers: