From 994bf8e96d092662e2d3e7840c16e93da0eeac4d Mon Sep 17 00:00:00 2001
From: Nauman_Ahad <Nauman_Ahad@dell.com>
Date: Mon, 9 Nov 2015 15:55:52 +0500
Subject: [PATCH] QTIP Jenkins Jobs for Dhrystone and SSL

Testing QTIP Jobs for Jenkins  on the dell-us-testing-bm-1
Jobs include: Dhrystone Serial (BM vs VM) and SSL (VM vs VM)
JIRA:QTIP-7

Change-Id: Ib3ceabe25ad6666cb49ec03b544ac79e1862d3ec
Signed-off-by: Nauman_Ahad <Nauman_Ahad@dell.com>
---
 jjb/qtip/qtip.yml | 36 ++++++++++++++----------------------
 1 file changed, 14 insertions(+), 22 deletions(-)

diff --git a/jjb/qtip/qtip.yml b/jjb/qtip/qtip.yml
index d777221c6..47ea4a085 100644
--- a/jjb/qtip/qtip.yml
+++ b/jjb/qtip/qtip.yml
@@ -5,8 +5,8 @@
         - 'qtip-daily-{stream}'
         - 'qtip-merge'
         - 'qtip-verify'
-        - 'qtip-dhrystone-VM_vs_Baremetal-{pod}'
-        - 'qtip_dhrystone-BM_vs_BM-{pod}'
+        - 'qtip-dhrystone-serial-{pod}'
+        - 'qtip-ssl-parallel-{pod}'
 
 
     # stream:    branch with - in place of / (eg. stable-helium)
@@ -15,9 +15,9 @@
 
     pod:
         - dell-build:
-           node: 'dell-build'
-           installer_type: 'foreman'
-           installer_ip: '172.18.0.12'
+           node: 'dell-us-testing-bm-1'
+           installer_type: 'fuel'
+           installer_ip: '10.20.0.2'
 
 
     stream:
@@ -192,7 +192,7 @@
             echo "merge logic goes here"
 
 - job-template:
-    name: 'qtip-dhrystone-VM_vs_Baremetal-{pod}'
+    name: 'qtip-dhrystone-serial-{pod}'
 
     project-type: freestyle
 
@@ -230,13 +230,13 @@
 
     builders:
         - 'qtip-fetch-os-cred'
-        - 'qtip-dhrystone-VM_vs_BM'
+        - 'qtip-dhrystone-serial'
 
     triggers:
-      - timed: '0 13 * * *'
+      - timed: '0 20 * * *'
 
 - job-template:
-    name: 'qtip_dhrystone-BM_vs_BM-{pod}'
+    name: 'qtip-ssl-parallel-{pod}'
 
 
     project-type: freestyle
@@ -275,7 +275,7 @@
 
     builders:
       - 'qtip-fetch-os-cred'
-      - 'qtip-dhrystone-BM_vs_BM'
+      - 'qtip-ssl-parallel'
 
     triggers:
       - timed: "@midnight"
@@ -284,43 +284,35 @@
 #biuilder macros
 ###########################
 - builder:
-    name: qtip-dhrystone-VM_vs_BM
+    name: qtip-dhrystone-serial
 
     builders:
         - shell: |
             #! /bin/bash
-
-
             if [[ ! -f $HOME/opnfv-openrc.sh]]; then
                echo "Unable to access file $HOME/opnfv-openrc.sh"
                exit 1
             fi
             source $HOME/opnfv-openrc.sh
             cd $WORKSPACE
-
-
             echo "Running QTIP dhrystone with First Test case"
-            ./QTIP.sh First dhrystone
+            python qtip.py -s compute -b dhrystone_serial.yaml
 
 
 - builder:
-    name: qtip-dhrystone-BM_vs_BM
+    name: qtip-ssl-parallel
 
     builders:
         - shell: |
             #!/bin/bash
-
-
             if [[ ! -f $HOME/opnfv-openrc.sh]]; then
                echo "Unable to access file $HOME/opnfv-openrc.sh"
                exit 1
             fi
             source $HOME/opnfv-openrc.sh
             cd $WORKSPACE
-
-
             echo "Running QTIP dhrystone with Second Test case"
-            ./QTIP.sh Second dhrystone
+            python qtip.py -s compute -b ssl_parallel.yaml
 
 
 - builder:
-- 
2.16.6