X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Ffunctest%2Ffunctest.yml;h=34c4241a51b2aad5926e77d9a06a162f6b9744d7;hb=f15532d1419fb73ae53e9fc0dc8276a034a11bd9;hp=0239da9d7be4ec00f8dc837d7eed11354848715a;hpb=add838b95be5dc813016930d10639dde32c56d1a;p=releng.git

diff --git a/jjb/functest/functest.yml b/jjb/functest/functest.yml
index 0239da9d7..34c4241a5 100644
--- a/jjb/functest/functest.yml
+++ b/jjb/functest/functest.yml
@@ -1,12 +1,19 @@
 - project:
     name: functest
-    
+
+    pod:
+        - 'opnfv-jump-1'
+        - 'opnfv-jump-2'
     jobs:
-        - 'functest-vim_bench-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)
@@ -18,11 +25,81 @@
     somevar: 'foo'
 
 - job-template:
-    name: functest-vim_bench-test
+    name: functest-openstack-bench-test
+
+    project-type: freestyle
+
+    node: opnfv-jump-2
+
+    logrotate:
+        daysToKeep: 30
+        numToKeep: 10
+        artifactDaysToKeep: -1
+        artifactNumToKeep: -1
+
+    builders:
+        - shell: |
+            python $HOME/.functest/run_rally.py all
+
+- job-template:
+    name: functest-openstack-tempest-smoke-test
 
     project-type: freestyle
-    
-    node: orange-build
+
+    node: opnfv-jump-2
+
+    logrotate:
+        daysToKeep: 30
+        numToKeep: 10
+        artifactDaysToKeep: -1
+        artifactNumToKeep: -1
+
+    builders:
+        - shell: |
+            rally verify start smoke
+            rally verify list
+
+- job-template:
+    name: functest-odl-test
+
+    project-type: freestyle
+
+    node: opnfv-jump-2
+
+    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: opnfv-jump-2
+
+    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
+
+    node: opnfv-jump-2
 
     logrotate:
         daysToKeep: 30
@@ -32,11 +109,29 @@
 
     builders:
         - shell: |
-            rally task start /home/ubuntu/rally/samples/tasks/scenario/opnfv/opnfv-keystone.json
+            python $HOME/.functest/vPing/vPing.py
+
+- job-template:
+    name: functest-{pod}
+
+    project-type: freestyle
+
+    node: '{pod}'
+
+    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:
@@ -73,10 +168,8 @@
         - test-macro
 
     builders:
-        - shell: |
-            pwd
-            find .
-            echo "Hello world from functest {somevar} daily"
+        - shell:
+            !include-raw docu-build.sh
 
     postbuilders:
         - test-macro
@@ -84,6 +177,8 @@
 - job-template:
     name: 'functest-verify'
 
+    node: master
+
     project-type: freestyle
 
     logrotate:
@@ -127,14 +222,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
@@ -177,52 +272,33 @@
                       branch-pattern: '**/master'
 
     builders:
-        - shell: |
-            pwd
-            find .
-            echo "merge logic goes here"
-
-- job-template:
-    name: 'functest-build-docs'
-
-    project-type: freestyle
-
-    logrotate:
-        daysToKeep: 30
-        numToKeep: 40
-        artifactDaysToKeep: -1
-        artifactNumToKeep: 5
-
-    parameters:
-        - project-parameter:
-            project: '{project}'
-        - gerrit-parameter:
-            branch: 'master'
-
-    scm:
-        - gerrit-trigger-scm:
-            credentials-id: '{ssh-credentials}'
-            refspec: ''
-            choosing-strategy: 'default'
-
-    wrappers:
-        - ssh-agent-credentials:
-            user: '{ssh-credentials}'
-
-    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'
+        - shell:
+            !include-raw docu-build.sh
 
+# macros
+- builder:
+    name: functest-all
     builders:
-        - shell: 
-            !include-raw build-docu.sh
+        - shell: |
+            echo "Functest: prepare Functest environment"
+            mkdir -p $HOME/functest/
+            rm -f $HOME/functest/config_functest.py
+            rm -f $HOME/functest/functest.yaml
+            wget https://git.opnfv.org/cgit/functest/plain/testcases/config_functest.py -P $HOME/functest/
+            wget https://git.opnfv.org/cgit/functest/plain/testcases/functest.yaml -P $HOME/functest/
+            source $HOME/functest/opnfv-openrc.sh
+            python $HOME/functest/config_functest.py -d start
+            echo "Functest: run Functest Rally Bench suites"
+            python $HOME/.functest/Rally_test/run_rally.py -d all
+            echo "Functest: run Tempest suite"
+            rally verify start smoke
+            rally verify list
+            echo "Functest: run vPing"
+            python $HOME/.functest/vPing/vPing.py -d
+            echo "Functest: run ODL suite"
+            $HOME/.functest/ODL/start_tests.sh
+            echo "Functest: copy results and clean Functest environment"
+            mkdir -p $HOME/functest/results
+            cp $HOME/.functest/Rally_test/results/* $HOME/functest/
+            python $HOME/functest/config_functest.py -d -f clean