X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;ds=sidebyside;f=jjb%2Ffunctest%2Ffunctest.yml;h=e81976a5cefc2ca5040011bec1b120b9e6ae13fe;hb=6d1c6e1be677099e0f89574ffd405de99de3568f;hp=c5650ac6721dd1bbd5842d39b652822daa20f827;hpb=1d044b52e4d800dacc2db15ab556f036df9ba634;p=releng.git

diff --git a/jjb/functest/functest.yml b/jjb/functest/functest.yml
index c5650ac67..e81976a5c 100644
--- a/jjb/functest/functest.yml
+++ b/jjb/functest/functest.yml
@@ -1,9 +1,13 @@
 - project:
     name: functest
 
+    pod:
+        - 'opnfv-jump-1'
+        - 'opnfv-jump-2'
     jobs:
-        - 'functest-vim_bench-test'
-        - 'functest-vim_tempest-test'
+        - 'functest-{pod}'
+        - 'functest-openstack-bench-test'
+        - 'functest-openstack-tempest-smoke-test'
         - 'functest-odl-test'
         - 'functest-vims-test'
         - 'functest-vping-test'
@@ -21,11 +25,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 +39,14 @@
 
     builders:
         - shell: |
-            python run_rally.py keystone
+            python $HOME/.functest/run_rally.py all
 
 - job-template:
-    name: functest-vim_tempest-test
+    name: functest-openstack-tempest-smoke-test
 
     project-type: freestyle
 
-    node: orange-build
+    node: opnfv-jump-2
 
     logrotate:
         daysToKeep: 30
@@ -52,14 +56,15 @@
 
     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 +81,7 @@
 
     project-type: freestyle
 
-    node: ericsson-build
+    node: opnfv-jump-2
 
     logrotate:
         daysToKeep: 30
@@ -94,6 +99,8 @@
 
     project-type: freestyle
 
+    node: opnfv-jump-2
+
     logrotate:
         daysToKeep: 30
         numToKeep: 10
@@ -102,9 +109,33 @@
 
     builders:
         - shell: |
-            echo "put your CI scenario here"
+            python $HOME/.functest/vPing/vPing.py
 
+- job-template:
+    name: functest-{pod}
+
+    project-type: freestyle
+
+    node: '{pod}'
+
+    parameters:
+        - project-parameter:
+            project: '{project}'
 
+    scm:
+        - git-scm:
+            credentials-id: '{ssh-credentials}'
+            refspec: ''
+            branch: master
+
+    logrotate:
+        daysToKeep: 30
+        numToKeep: 10
+        artifactDaysToKeep: -1
+        artifactNumToKeep: -1
+
+    builders:
+        - 'functest-all'
 
 - job-template:
     name: 'functest-daily-{stream}'
@@ -148,7 +179,7 @@
 
     builders:
         - shell:
-            !include-raw build-upload-docu.sh
+            !include-raw docu-build.sh
 
     postbuilders:
         - test-macro
@@ -202,7 +233,7 @@
 
     builders:
         - shell:
-            !include-raw build-docu-verify.sh
+            !include-raw docu-verify.sh
 
 - job-template:
     name: 'functest-merge'
@@ -251,6 +282,52 @@
                       branch-pattern: '**/master'
 
     builders:
-        - shell: 
-            !include-raw build-upload-docu.sh
+        - shell:
+            !include-raw docu-build.sh
+
+# macros
+- builder:
+    name: functest-all
+    builders:
+        - shell: |
+            #!/bin/bash
+            set +e
+
+            echo "Functest: prepare Functest environment"
+            mkdir -p $HOME/functest/
+            source $HOME/functest/opnfv-openrc.sh
+
+            # WORKSPACE is the root of the functest repo
+            # go into WORKSPACE where the functest repo is cloned
+            cd $WORKSPACE
+
+            # prepare
+            echo "Functest: prepare Functest environment"
+            python $WORKSPACE/testcases/config_functest.py --debug $WORKSPACE/ start
+
+            # tempest
+            echo "Functest: run Tempest suite"
+            rally verify start smoke
+            rally verify list
+
+            # vPing
+            echo "Functest: run vPing"
+            python $WORKSPACE/testcases/vPing/CI/libraries/vPing.py --debug $WORKSPACE/
+
+            # rally
+            echo "Functest: run Functest Rally Bench suites"
+            python $WORKSPACE/testcases/VIM/OpenStack/CI/libraries/run_rally.py --debug $WORKSPACE/ all
+
+            # ODL
+            echo "Functest: run ODL suite"
+            $WORKSPACE/testcases/Controllers/ODL/CI/start_tests.sh
+
+            # collect results
+            echo "Functest: copy results and clean Functest environment"
+            mkdir -p $HOME/functest/results
+
+            # save tempest.conf for further troubleshooting
+            cp $HOME/.rally/tempest/for-deployment-*/tempest.conf $HOME/functest/results
 
+            # cleanup
+            python $WORKSPACE/testcases/config_functest.py --debug --force $WORKSPACE/ clean