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

[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 b63782b..282cb93 100644 (file)
--- a/jjb/qtip/qtip-validate-jobs.yml
+++ b/jjb/qtip/qtip-validate-jobs.yml
@@ -14,6 +14,11 @@
       branch: '{stream}'
       gs-pathname: ''
       docker-tag: latest
+    euphrates: &euphrates
+      stream: euphrates
+      branch: 'stable/{stream}'
+      gs-pathname: '{stream}'
+      docker-tag: 'stable'
 
     # -------------------------------
     # JOB VARIABLES
@@ -21,25 +26,37 @@
     qpi:
       - compute:
           installer: apex
-          pod: zte-pod4
+          pod: zte-virtual5
           <<: *master
       - storage:
           installer: apex
-          pod: zte-pod4
+          pod: zte-virtual5
           <<: *master
+      - compute:
+          installer: fuel
+          pod: zte-virtual6
+          <<: *master
+
+    # -------------------------------
+    # SYSTEM UNDER TEST
+    # -------------------------------
+    sut:
+      - 'host'
+      - 'vnf'
 
     # -------------------------------
     # JOB LIST
     # -------------------------------
     jobs:
-      - 'qtip-{qpi}-{installer}-{stream}'
+      - 'qtip-{qpi}-{sut}-{installer}-{pod}-{stream}'
 
 ################################
 # job templates
 ################################
 - job-template:
-    name: 'qtip-{qpi}-{installer}-{stream}'
+    name: 'qtip-{qpi}-{sut}-{installer}-{pod}-{stream}'
     disabled: false
+
     parameters:
       - project-parameter:
           project: '{project}'
@@ -60,9 +77,24 @@
       - string:
           name: TEST_SUITE
           default: '{qpi}'
+      - string:
+          name: TESTAPI_URL
+          default: 'http://testresults.opnfv.org/test/api/v1'
+      - string:
+          name: OPNFV_RELEASE
+          default: '{stream}'
+      - string:
+          name: SUT
+          default: '{sut}'
     scm:
       - git-scm
 
+    wrappers:
+      - timeout:
+          timeout: 30
+          abort: true
+      - timestamps
+
     triggers:
       - 'qtip-daily'