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

diff --git a/jjb/functest/functest.yml b/jjb/functest/functest.yml
index e81976a5c..1d4abb971 100644
--- a/jjb/functest/functest.yml
+++ b/jjb/functest/functest.yml
@@ -1,3 +1,6 @@
+###################################
+# job configuration for functest
+###################################
 - project:
     name: functest
 
@@ -6,30 +9,68 @@
         - 'opnfv-jump-2'
     jobs:
         - 'functest-{pod}'
-        - 'functest-openstack-bench-test'
-        - 'functest-openstack-tempest-smoke-test'
-        - 'functest-odl-test'
-        - 'functest-vims-test'
-        - 'functest-vping-test'
+        - 'set-functest-env-{pod}'
+        - 'clean-functest-env-{pod}'
+        - 'functest-openstack-bench-test-{pod}'
+        - 'functest-openstack-tempest-smoke-test-{pod}'
+        - 'functest-odl-test-{pod}'
+        - 'functest-vims-test-{pod}'
+        - 'functest-vping-test-{pod}'
         - 'functest-daily-{stream}'
         - 'functest-merge'
-        - 'functest-verify'
+        - 'functest-verify-{stream}'
 
-    # stream:    branch with - in place of / (eg. stable-helium)
-    # branch:    branch (eg. stable/helium)
+    # stream:    branch with - in place of / (eg. stable-arno)
+    # branch:    branch (eg. stable/arno)
     stream:
         - master:
             branch: 'master'
+            gs-pathname: ''
+        - stable-arno:
+            branch: 'stable/arno'
+            gs-pathname: '/arno'
 
     project: 'functest'
     somevar: 'foo'
+################################
+# job template
+################################
+- job-template:
+    name: set-functest-env-{pod}
+
+    project-type: freestyle
+
+    node: '{pod}'
+
+    logrotate:
+        daysToKeep: 30
+        numToKeep: 10
+        artifactDaysToKeep: -1
+        artifactNumToKeep: -1
+
+    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
+            
 - job-template:
-    name: functest-openstack-bench-test
+    name: clean-functest-env-{pod}
 
     project-type: freestyle
 
-    node: opnfv-jump-2
+    node: '{pod}'
 
     logrotate:
         daysToKeep: 30
@@ -39,14 +80,49 @@
 
     builders:
         - shell: |
-            python $HOME/.functest/run_rally.py all
+            #!/bin/bash
+            set +e
+
+            # collect results
+            echo "Functest: copy results and clean Functest environment"
+            mkdir -p $HOME/functest/results
+
+            # save ODL results
+            cp -Rf $WORSPACE/testcases/Controllers/ODL/CI/logs $HOME/functest/results/ODL
+
+            # 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
+
+- job-template:
+    name: functest-openstack-bench-test-{pod}
+
+    project-type: freestyle
+
+    node: '{pod}'
+
+    logrotate:
+        daysToKeep: 30
+        numToKeep: 10
+        artifactDaysToKeep: -1
+        artifactNumToKeep: -1
+
+    builders:
+        - shell: |
+            #!/bin/bash
+            set +e
+
+            echo "Functest: run Functest Rally Bench suites"
+            python $WORKSPACE/testcases/VIM/OpenStack/CI/libraries/run_rally.py --debug $WORKSPACE/ all
 
 - job-template:
-    name: functest-openstack-tempest-smoke-test
+    name: functest-openstack-tempest-smoke-test-{pod}
 
     project-type: freestyle
 
-    node: opnfv-jump-2
+    node: '{pod}'
 
     logrotate:
         daysToKeep: 30
@@ -56,15 +132,20 @@
 
     builders:
         - shell: |
+            #!/bin/bash
+            set +e
+
+            # tempest
+            echo "Functest: run Tempest suite"
             rally verify start smoke
             rally verify list
 
 - job-template:
-    name: functest-odl-test
+    name: functest-odl-test-{pod}
 
     project-type: freestyle
 
-    node: opnfv-jump-2
+    node: '{pod}'
 
     logrotate:
         daysToKeep: 30
@@ -74,14 +155,18 @@
 
     builders:
         - shell: |
-            echo "put your CI scenario here"
+            #!/bin/bash
+            set +e
+
+            echo "Functest: run ODL suite"
+            $WORKSPACE/testcases/Controllers/ODL/CI/start_tests.sh
 
 - job-template:
-    name: functest-vims-test
+    name: functest-vims-test-{pod}
 
     project-type: freestyle
 
-    node: opnfv-jump-2
+    node: '{pod}'
 
     logrotate:
         daysToKeep: 30
@@ -95,11 +180,11 @@
 
 
 - job-template:
-    name: functest-vping-test
+    name: functest-vping-test-{pod}
 
     project-type: freestyle
 
-    node: opnfv-jump-2
+    node: '{pod}'
 
     logrotate:
         daysToKeep: 30
@@ -109,7 +194,12 @@
 
     builders:
         - shell: |
-            python $HOME/.functest/vPing/vPing.py
+            #!/bin/bash
+            set +e
+
+            # vPing
+            echo "Functest: run vPing"
+            python $WORKSPACE/testcases/vPing/CI/libraries/vPing.py --debug $WORKSPACE/
 
 - job-template:
     name: functest-{pod}
@@ -136,6 +226,8 @@
 
     builders:
         - 'functest-all'
+        - 'functest-store-results'
+        - 'functest-cleanup'
 
 - job-template:
     name: 'functest-daily-{stream}'
@@ -160,32 +252,34 @@
     parameters:
         - project-parameter:
             project: '{project}'
+        - functest-parameter:
+            gs-pathname: '{gs-pathname}'
 
     scm:
         - git-scm:
             credentials-id: '{ssh-credentials}'
             refspec: ''
-            branch: '{branch}'
+            branch: '{stream}'
 
     wrappers:
         - ssh-agent-credentials:
             user: '{ssh-credentials}'
 
     triggers:
-        - timed: 'H H * * *'
+        - 'functest-{stream}'
 
     prebuilders:
         - test-macro
 
     builders:
         - shell:
-            !include-raw docu-build.sh
+            !include-raw ../opnfvdocs/docu-build.sh
 
     postbuilders:
         - test-macro
 
 - job-template:
-    name: 'functest-verify'
+    name: 'functest-verify-{stream}'
 
     node: master
 
@@ -201,7 +295,7 @@
         - project-parameter:
             project: '{project}'
         - gerrit-parameter:
-            branch: 'master'
+            branch: '{branch}'
     scm:
         - gerrit-trigger-scm:
             credentials-id: '{ssh-credentials}'
@@ -229,11 +323,11 @@
                 project-pattern: 'functest'
                 branches:
                   - branch-compare-type: 'ANT'
-                    branch-pattern: '**/master'
+                    branch-pattern: '**/{branch}'
 
     builders:
         - shell:
-            !include-raw docu-verify.sh
+            !include-raw ../opnfvdocs/docu-build.sh
 
 - job-template:
     name: 'functest-merge'
@@ -283,7 +377,31 @@
 
     builders:
         - shell:
-            !include-raw docu-build.sh
+            !include-raw ../opnfvdocs/docu-build.sh
+
+########################
+# parameter macros
+########################
+- parameter:
+    name: functest-parameter
+    parameters:
+        - string:
+            name: GS_PATHNAME
+            default: '{gs-pathname}'
+            description: "Version directory where the opnfv documents will be stored in gs repository"
+
+########################
+# trigger macros
+########################
+- trigger:
+    name: 'functest-master'
+    triggers:
+        - pollscm: "H 9 * * *"
+
+- trigger:
+    name: 'functest-stable-arno'
+    triggers:
+        - pollscm: "H 21 * * *"
 
 # macros
 - builder:
@@ -305,29 +423,46 @@
             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/
 
+            # ODL
+            echo "Functest: run ODL suite"
+            $WORKSPACE/testcases/Controllers/ODL/CI/start_tests.sh
+
             # 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
+            # tempest
+            echo "Functest: run Tempest suite"
+            rally verify start smoke
+            rally verify list
 
             # collect results
             echo "Functest: copy results and clean Functest environment"
             mkdir -p $HOME/functest/results
 
+            # save ODL results
+            cp -Rf $WORSPACE/testcases/Controllers/ODL/CI/logs $HOME/functest/results/ODL
+
             # save tempest.conf for further troubleshooting
             cp $HOME/.rally/tempest/for-deployment-*/tempest.conf $HOME/functest/results
 
+- builder:
+    name: functest-store-results
+    builders:
+        - shell:
+            !include-raw res-build.sh
+
+- builder:
+    name: functest-cleanup
+    builders:
+        - shell:
+        - shell: |
+            #!/bin/bash
+            set +e
+
             # cleanup
             python $WORKSPACE/testcases/config_functest.py --debug --force $WORKSPACE/ clean