X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fqtip%2Fqtip.yml;h=3875158814571631efd23b9cc0bfa92e68fa78c3;hb=refs%2Fchanges%2F92%2F1392%2F1;hp=bd07facae6fee48773845e3e617341626250168f;hpb=9c26f11c59228c0e4a430f2badd70e47ca8884b4;p=releng.git

diff --git a/jjb/qtip/qtip.yml b/jjb/qtip/qtip.yml
index bd07facae..387515881 100644
--- a/jjb/qtip/qtip.yml
+++ b/jjb/qtip/qtip.yml
@@ -1,19 +1,25 @@
 - project:
     name: qtip
-    pod:
-       - dell-build:
-           node: 'dell-build'
-           installer_type: 'foreman'
-           installer_ip: '172.18.0.12'
     jobs:
         - 'qtip-test'
         - 'qtip-daily-{stream}'
         - 'qtip-merge'
         - 'qtip-verify'
-        - 'qtip-dhrystone-VM_vs_Baremetal'
-        - 'qtip_dhrystone-Baremetal_vs_Baremetal'
+        - 'qtip-dhrystone-VM_vs_Baremetal-{pod}'
+        - 'qtip_dhrystone-BM_vs_BM-{pod}'
+
+
     # stream:    branch with - in place of / (eg. stable-helium)
     # branch:    branch (eg. stable/helium)
+
+
+    pod:
+        - dell-build:
+           node: 'dell-build'
+           installer_type: 'foreman'
+           installer_ip: '172.18.0.12'
+
+
     stream:
         - master:
             branch: 'master'
@@ -58,6 +64,7 @@
         - project-parameter:
             project: '{project}'
 
+
     scm:
         - git-scm:
             credentials-id: '{ssh-credentials}'
@@ -184,79 +191,88 @@
             find .
             echo "merge logic goes here"
 
- - job-template:
-     name: 'qtip-dhrystone-VM_vs_Baremetal'
+- job-template:
+    name: 'qtip-dhrystone-VM_vs_Baremetal-{pod}'
 
-     project-type: freestyle
+    project-type: freestyle
 
-     disabled: false
+    disabled: false
 
-     node: '{node}'
+    node: '{node}'
 
-     logrotate:
-       daysToKeep: 30
-       numToKeep: 10
-       artifactDaysToKeep: -1
-       artifactNumToKeep: -1
+    logrotate:
+      daysToKeep: 30
+      numToKeep: 10
+      artifactDaysToKeep: -1
+      artifactNumToKeep: -1
 
-     parameters:
-       - project-parameter:
-           project: '{project}'
-       - string:
-           name: INSTALLER_TYPE
-           default: '{installer_type}'
-           description: "Installer name that is used for deployment."
-       - stirng:
-           name: INSTALLER_IP
-           default: '{Installer_ip}'
-           description "Installer IP"
+    parameters:
+      - project-parameter:
+          project: '{project}'
+      - string:
+          name: INSTALLER_TYPE
+          default: '{installer_type}'
+          description: "Installer name that is used for deployment."
+      - string:
+          name: INSTALLER_IP
+          default: '{installer_ip}'
+          description: "Installer IP"
+      - string:
+          name: GIT_BASE
+          default: https://gerrit.opnfv.org/gerrit/$PROJECT
+          description: "Used for overriding the GIT URL coming from Global Jenkins configuration in case if the stuff is done on none-LF HW."
 
-     scm:
-        - git-scm:
-            credentials-id: '{ssh-credentials}'
-            refspec: ''
-            branch: master
+    scm:
+       - git-scm:
+           credentials-id: '{ssh-credentials}'
+           refspec: ''
+           branch: master
 
-     builders:
-         - 'qtip-fetch-os-cred'
-         - 'qtip-dhrystone-VM_vs_BM'
+    builders:
+        - 'qtip-fetch-os-cred'
+        - 'qtip-dhrystone-VM_vs_BM'
 
 - job-template:
-     name: 'qtip-dhrystone-Baremetal_vs_Baremetal'
+    name: 'qtip_dhrystone-BM_vs_BM-{pod}'
+
 
-     project-type: freestyle
+    project-type: freestyle
 
-     disabled: false
+    disabled: false
 
-     node: '{node}'
+    node: '{node}'
 
-     logrotate:
-       daysToKeep: 30
-       numToKeep: 10
-       artifactDaysToKeep: -1
-       artifactNumToKeep: -1
+    logrotate:
+      daysToKeep: 30
+      numToKeep: 10
+      artifactDaysToKeep: -1
+      artifactNumToKeep: -1
 
-     parameters:
-       - project-parameter:
-           project: '{project}'
-       - string:
-           name: INSTALLER_TYPE
-           default: '{installer_type}'
-           description: "Installer name that is used for deployment."
-       - string:
-           name: INSTALLER_IP
-           default: '{installer_ip}'
-           description: "IP address of the installer"
+    parameters:
+      - project-parameter:
+          project: '{project}'
+      - string:
+          name: INSTALLER_TYPE
+          default: '{installer_type}'
+          description: "Installer name that is used for deployment."
+      - string:
+          name: INSTALLER_IP
+          default: '{installer_ip}'
+          description: "IP address of the installer"
+      - string:
+          name: GIT_BASE
+          default: https://gerrit.opnfv.org/gerrit/$PROJECT
+          description: "Used for overriding the GIT URL coming from Global Jenkins configuration in case if the stuff is done on none-LF HW."
 
-     scm:
-        - git-scm:
-            credentials-id: '{ssh-credentials}'
-            refspec: ''
-            branch: master
+    scm:
+       - git-scm:
+           credentials-id: '{ssh-credentials}'
+           refspec: ''
+           branch: master
 
-     builders:
-       - 'qtip-fetch-os-cred'
-       - 'qtip-dhrystone-BM_vs_BM'
+    builders:
+      - 'qtip-fetch-os-cred'
+      - 'qtip-dhrystone-BM_vs_BM'
 
 
 ###########################