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 282cb93..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'
@@ -27,34 +27,36 @@
       - compute:
           installer: apex
           pod: zte-virtual5
+          sut: node
           <<: *master
       - storage:
           installer: apex
           pod: zte-virtual5
+          sut: ''
+          <<: *master
+      - network:
+          installer: apex
+          pod: zte-virtual5
+          sut: ''
           <<: *master
       - compute:
           installer: fuel
           pod: zte-virtual6
+          sut: vnf
           <<: *master
 
-    # -------------------------------
-    # SYSTEM UNDER TEST
-    # -------------------------------
-    sut:
-      - 'host'
-      - 'vnf'
 
     # -------------------------------
     # JOB LIST
     # -------------------------------
     jobs:
-      - 'qtip-{qpi}-{sut}-{installer}-{pod}-{stream}'
+      - 'qtip-{qpi}-{installer}-{pod}-{stream}'
 
 ################################
 # job templates
 ################################
 - job-template:
-    name: 'qtip-{qpi}-{sut}-{installer}-{pod}-{stream}'
+    name: 'qtip-{qpi}-{installer}-{pod}-{stream}'
     disabled: false
 
     parameters:
@@ -85,13 +87,14 @@
           default: '{stream}'
       - string:
           name: SUT
+          description: "System Under Test"
           default: '{sut}'
     scm:
       - git-scm
 
     wrappers:
       - timeout:
-          timeout: 30
+          timeout: 120
           abort: true
       - timestamps