X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Ffunctest%2Ffunctest.yml;h=b3d1ce831188ba6f7fcf3baf5e7375f862a879cb;hb=5ae36c129b0678abb84e54bd916bf2712afe01e6;hp=211af0c42e9e513e417162201c4a4016905db23b;hpb=69b7521610f6acc0fd6487bf560284f815f15fbe;p=releng.git

diff --git a/jjb/functest/functest.yml b/jjb/functest/functest.yml
index 211af0c42..b3d1ce831 100644
--- a/jjb/functest/functest.yml
+++ b/jjb/functest/functest.yml
@@ -2,8 +2,8 @@
     name: functest
 
     jobs:
-        - 'functest-vim_bench-test'
-        - 'functest-vim_tempest-test'
+        - 'functest-openstack-bench-test'
+        - 'functest-openstack-tempest-smoke-test'
         - 'functest-odl-test'
         - 'functest-vims-test'
         - 'functest-vping-test'
@@ -21,11 +21,11 @@
     somevar: 'foo'
 
 - job-template:
-    name: functest-vim_bench-test
+    name: functest-openstack-bench-test
 
     project-type: freestyle
 
-    node: orange-build
+    node: opnfv-jump-2
 
     logrotate:
         daysToKeep: 30
@@ -35,14 +35,14 @@
 
     builders:
         - shell: |
-            python run_rally.py keystone
+            python .functest/run_rally.py all
 
 - job-template:
-    name: functest-vim_tempest-test
+    name: functest-openstack-tempest-smoke-test
 
     project-type: freestyle
 
-    node: ericsson-test
+    node: opnfv-jump-2
 
     logrotate:
         daysToKeep: 30
@@ -52,14 +52,16 @@
 
     builders:
         - shell: |
-            rally verify start
+            rally verify start smoke
+            rally verify list
+            
 
 - job-template:
     name: functest-odl-test
 
     project-type: freestyle
 
-    node: ericsson-build
+    node: opnfv-jump-2
 
     logrotate:
         daysToKeep: 30
@@ -76,7 +78,7 @@
 
     project-type: freestyle
 
-    node: ericsson-build
+    node: opnfv-jump-2
 
     logrotate:
         daysToKeep: 30
@@ -93,6 +95,8 @@
     name: functest-vping-test
 
     project-type: freestyle
+    
+    node: opnfv-jump-2
 
     logrotate:
         daysToKeep: 30
@@ -102,7 +106,7 @@
 
     builders:
         - shell: |
-            echo "put your CI scenario here"
+            python ./.functest/vPing/vPing.py