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

diff --git a/jjb/functest/functest.yml b/jjb/functest/functest.yml
index be7f68940..e81976a5c 100644
--- a/jjb/functest/functest.yml
+++ b/jjb/functest/functest.yml
@@ -1,16 +1,19 @@
 - 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'
         - 'functest-daily-{stream}'
         - 'functest-merge'
         - 'functest-verify'
-        - 'functest-build-docs'
 
     # stream:    branch with - in place of / (eg. stable-helium)
     # branch:    branch (eg. stable/helium)
@@ -22,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
@@ -36,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
@@ -53,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
@@ -77,7 +81,7 @@
 
     project-type: freestyle
 
-    node: ericsson-build
+    node: opnfv-jump-2
 
     logrotate:
         daysToKeep: 30
@@ -95,6 +99,8 @@
 
     project-type: freestyle
 
+    node: opnfv-jump-2
+
     logrotate:
         daysToKeep: 30
         numToKeep: 10
@@ -103,13 +109,39 @@
 
     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}'
 
+    node: master
+
     # Job template for daily builders
     #
     # Required Variables:
@@ -146,10 +178,8 @@
         - test-macro
 
     builders:
-        - shell: |
-            pwd
-            find .
-            echo "Hello world from functest {somevar} daily"
+        - shell:
+            !include-raw docu-build.sh
 
     postbuilders:
         - test-macro
@@ -157,6 +187,8 @@
 - job-template:
     name: 'functest-verify'
 
+    node: master
+
     project-type: freestyle
 
     logrotate:
@@ -200,14 +232,14 @@
                     branch-pattern: '**/master'
 
     builders:
-        - shell: |
-            pwd
-            find .
-            echo "verify logic goes here"
+        - shell:
+            !include-raw docu-verify.sh
 
 - job-template:
     name: 'functest-merge'
 
+    node: master
+
     # builder-merge job to run JJB update
     #
     # This job's purpose is to update all the JJB
@@ -249,53 +281,53 @@
                     - branch-compare-type: 'ANT'
                       branch-pattern: '**/master'
 
+    builders:
+        - shell:
+            !include-raw docu-build.sh
+
+# macros
+- builder:
+    name: functest-all
     builders:
         - shell: |
-            pwd
-            find .
-            echo "merge logic goes here"
+            #!/bin/bash
+            set +e
 
-- job-template:
-    name: 'functest-build-docs'
+            echo "Functest: prepare Functest environment"
+            mkdir -p $HOME/functest/
+            source $HOME/functest/opnfv-openrc.sh
 
-    project-type: freestyle
+            # WORKSPACE is the root of the functest repo
+            # go into WORKSPACE where the functest repo is cloned
+            cd $WORKSPACE
 
-    logrotate:
-        daysToKeep: 30
-        numToKeep: 40
-        artifactDaysToKeep: -1
-        artifactNumToKeep: 5
+            # prepare
+            echo "Functest: prepare Functest environment"
+            python $WORKSPACE/testcases/config_functest.py --debug $WORKSPACE/ start
 
-    parameters:
-        - project-parameter:
-            project: '{project}'
-        - gerrit-parameter:
-            branch: 'master'
+            # tempest
+            echo "Functest: run Tempest suite"
+            rally verify start smoke
+            rally verify list
 
-    scm:
-        - gerrit-trigger-scm:
-            credentials-id: '{ssh-credentials}'
-            refspec: ''
-            choosing-strategy: 'default'
+            # vPing
+            echo "Functest: run vPing"
+            python $WORKSPACE/testcases/vPing/CI/libraries/vPing.py --debug $WORKSPACE/
 
-    wrappers:
-        - ssh-agent-credentials:
-            user: '{ssh-credentials}'
+            # rally
+            echo "Functest: run Functest Rally Bench suites"
+            python $WORKSPACE/testcases/VIM/OpenStack/CI/libraries/run_rally.py --debug $WORKSPACE/ all
 
-    triggers:
-        - gerrit:
-            trigger-on:
-                - change-merged-event
-                - comment-added-contains-event:
-                    comment-contains-value: 'remerge'
-            projects:
-              - project-compare-type: 'ANT'
-                project-pattern: 'functest'
-                branches:
-                    - branch-compare-type: 'ANT'
-                      branch-pattern: '**/master'
+            # ODL
+            echo "Functest: run ODL suite"
+            $WORKSPACE/testcases/Controllers/ODL/CI/start_tests.sh
 
-    builders:
-        - shell: 
-            !include-raw build-docu.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