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 b3d1ce8..7def724 100644 (file)
--- a/jjb/functest/functest.yml
+++ b/jjb/functest/functest.yml
@@ -1,7 +1,11 @@
 - project:
     name: functest
 
+    pod:
+        - 'opnfv-jump-1'
+        - 'opnfv-jump-2'
     jobs:
+        - 'functest-{pod}'
         - 'functest-openstack-bench-test'
         - 'functest-openstack-tempest-smoke-test'
         - 'functest-odl-test'
@@ -35,7 +39,7 @@
 
     builders:
         - shell: |
-            python .functest/run_rally.py all
+            python $HOME/.functest/run_rally.py all
 
 - job-template:
     name: functest-openstack-tempest-smoke-test
@@ -54,7 +58,6 @@
         - shell: |
             rally verify start smoke
             rally verify list
-            
 
 - job-template:
     name: functest-odl-test
@@ -95,7 +98,7 @@
     name: functest-vping-test
 
     project-type: freestyle
-    
+
     node: opnfv-jump-2
 
     logrotate:
@@ -106,9 +109,23 @@
 
     builders:
         - shell: |
-            python ./.functest/vPing/vPing.py
+            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}'
@@ -258,3 +275,19 @@
         - 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
+