From 063bbeace3c756cc1fac672282cb5dc18d58b924 Mon Sep 17 00:00:00 2001
From: morganrOL <morgan.richomme@orange.com>
Date: Fri, 10 Apr 2015 16:49:42 +0200
Subject: [PATCH] Add new template jobs for tempest, correct bench test,
 prepare ODL, vIMS, vPing template

JIRA: FUNCTEST-1

Change-Id: I0aca7dfbf12718642ce036cde9900b64e23660aa
Signed-off-by: morganrOL <morgan.richomme@orange.com>
---
 jjb/functest/functest.yml | 79 +++++++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 76 insertions(+), 3 deletions(-)

diff --git a/jjb/functest/functest.yml b/jjb/functest/functest.yml
index 0239da9d7..be7f68940 100644
--- a/jjb/functest/functest.yml
+++ b/jjb/functest/functest.yml
@@ -1,8 +1,12 @@
 - project:
     name: functest
-    
+
     jobs:
         - 'functest-vim_bench-test'
+        - 'functest-vim_tempest-test'
+        - 'functest-odl-test'
+        - 'functest-vims-test'
+        - 'functest-vping-test'
         - 'functest-daily-{stream}'
         - 'functest-merge'
         - 'functest-verify'
@@ -21,7 +25,7 @@
     name: functest-vim_bench-test
 
     project-type: freestyle
-    
+
     node: orange-build
 
     logrotate:
@@ -32,7 +36,76 @@
 
     builders:
         - shell: |
-            rally task start /home/ubuntu/rally/samples/tasks/scenario/opnfv/opnfv-keystone.json
+            python run_rally.py keystone
+
+- job-template:
+    name: functest-vim_tempest-test
+
+    project-type: freestyle
+
+    node: orange-build
+
+    logrotate:
+        daysToKeep: 30
+        numToKeep: 10
+        artifactDaysToKeep: -1
+        artifactNumToKeep: -1
+
+    builders:
+        - shell: |
+            rally verify start
+
+- job-template:
+    name: functest-odl-test
+
+    project-type: freestyle
+
+    node: ericsson-build
+
+    logrotate:
+        daysToKeep: 30
+        numToKeep: 10
+        artifactDaysToKeep: -1
+        artifactNumToKeep: -1
+
+    builders:
+        - shell: |
+            echo "put your CI scenario here"
+
+- job-template:
+    name: functest-vims-test
+
+    project-type: freestyle
+
+    node: ericsson-build
+
+    logrotate:
+        daysToKeep: 30
+        numToKeep: 10
+        artifactDaysToKeep: -1
+        artifactNumToKeep: -1
+
+    builders:
+        - shell: |
+            echo "put your CI scenario here"
+
+
+- job-template:
+    name: functest-vping-test
+
+    project-type: freestyle
+
+    logrotate:
+        daysToKeep: 30
+        numToKeep: 10
+        artifactDaysToKeep: -1
+        artifactNumToKeep: -1
+
+    builders:
+        - shell: |
+            echo "put your CI scenario here"
+
+
 
 - job-template:
     name: 'functest-daily-{stream}'
-- 
2.16.6