[QTIP] Add a new variable "SUT" in project

QTIP test runs against with host and vnf.

Change-Id: I863cb48356f6ba74043b51ebfae8e5ff2f241abc
Signed-off-by: zhihui wu <wu.zhihui1@zte.com.cn>

diff --git a/jjb/qtip/qtip-experimental-jobs.yml b/jjb/qtip/qtip-experimental-jobs.yml
index b130912..ee143b4 100644 (file)
--- a/jjb/qtip/qtip-experimental-jobs.yml
+++ b/jjb/qtip/qtip-experimental-jobs.yml
@@ -7,7 +7,7 @@
     name: qtip-experimental-jobs
     project: qtip
     jobs:
-      - 'qtip-experimental-{pod}-{stream}'
+      - 'qtip-{sut}-experimental-{pod}-{stream}'
     stream:
       - master:
           branch: '{stream}'
@@ -19,12 +19,19 @@
           installer: fuel
           pod: zte-virtual6
 
+    # -------------------------------
+    # SYSTEM UNDER TEST
+    # -------------------------------
+    sut:
+      - 'host'
+      - 'vnf'
+
 ################################
 ## job templates
 #################################
 
 - job-template:
-    name: 'qtip-experimental-{pod}-{stream}'
+    name: 'qtip-{sut}-experimental-{pod}-{stream}'
 
     disabled: '{obj:disabled}'
 
@@ -34,6 +41,9 @@
           branch: '{branch}'
       - '{installer}-defaults'
       - '{pod}-defaults'
+      - string:
+          name: SUT
+          default: '{sut}'
     scm:
       - git-scm-gerrit
 

diff --git a/jjb/qtip/qtip-validate-jobs.yml b/jjb/qtip/qtip-validate-jobs.yml
index 3a487fa..282cb93 100644 (file)
--- a/jjb/qtip/qtip-validate-jobs.yml
+++ b/jjb/qtip/qtip-validate-jobs.yml
@@ -37,17 +37,24 @@
           pod: zte-virtual6
           <<: *master
 
+    # -------------------------------
+    # SYSTEM UNDER TEST
+    # -------------------------------
+    sut:
+      - 'host'
+      - 'vnf'
+
     # -------------------------------
     # JOB LIST
     # -------------------------------
     jobs:
-      - 'qtip-{qpi}-{installer}-{pod}-{stream}'
+      - 'qtip-{qpi}-{sut}-{installer}-{pod}-{stream}'
 
 ################################
 # job templates
 ################################
 - job-template:
-    name: 'qtip-{qpi}-{installer}-{pod}-{stream}'
+    name: 'qtip-{qpi}-{sut}-{installer}-{pod}-{stream}'
     disabled: false
 
     parameters:
@@ -76,6 +83,9 @@
       - string:
           name: OPNFV_RELEASE
           default: '{stream}'
+      - string:
+          name: SUT
+          default: '{sut}'
     scm:
       - git-scm