modify functest-all scenario for CI, source config then recreate environment (network...

[releng.git] / jjb / functest / functest.yml

diff --git a/jjb/functest/functest.yml b/jjb/functest/functest.yml
index 9c1ca08..7def724 100644 (file)
--- 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,13 +109,29 @@
 
     builders:
         - shell: |
-            echo "put your CI scenario here"
+            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:
@@ -146,7 +169,7 @@
 
     builders:
         - shell:
-            !include-raw build-docu.sh
+            !include-raw docu-build.sh
 
     postbuilders:
         - test-macro
@@ -154,6 +177,8 @@
 - job-template:
     name: 'functest-verify'
 
+    node: master
+
     project-type: freestyle
 
     logrotate:
@@ -198,11 +223,13 @@
 
     builders:
         - shell:
-            !include-raw build-docu.sh
+            !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
@@ -245,6 +272,22 @@
                       branch-pattern: '**/master'
 
     builders:
-        - shell: 
-            !include-raw build-docu.sh
+        - shell:
+            !include-raw docu-build.sh
+
+# macros
+- builder:
+    name: functest-all
+    builders:
+        - shell: |
+            echo "Functest: prepare Functest environment"
+            source $HOME/functest/opnfv-openrc.sh
+            python $HOME/functest/config_functest.py start
+            echo "Functest: run Functest suites"
+            python $HOME/.functest/Rally_test/run_rally.py all
+            python $HOME/.functest/Rally_test/run_rally.py tempest smoke
+            python $HOME/.functest/vPing/vPing.py
+            $HOME/.functest/ODL/start_tests.sh
+            echo "Functest: clean Functest environment"
+            python $HOME/functest/config_functest.py clean