X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;ds=sidebyside;f=jjb%2Ffunctest%2Ffunctest.yml;h=0d776065f5925adc1bb8a814641e5506e73f8774;hb=d96f2a6000e39a2ab5e725bd27736b9a58ca6288;hp=f441594c80637b7ae15f7e01ed1f4d6f58c96437;hpb=14c253c2edb4d7bda9852c2006a334445950cc47;p=releng.git

diff --git a/jjb/functest/functest.yml b/jjb/functest/functest.yml
index f441594c8..0d776065f 100644
--- a/jjb/functest/functest.yml
+++ b/jjb/functest/functest.yml
@@ -3,18 +3,29 @@
 ###################################
 - project:
     name: functest
-
     pod:
-        - 'opnfv-jump-1'
-        - 'opnfv-jump-2'
+        - opnfv-jump-1:
+            node: 'opnfv-jump-1'
+            installer_type: 'fuel'
+            installer_ip: '10.20.0.2'
+        - opnfv-jump-2:
+            node: 'opnfv-jump-2'
+            installer_type: 'foreman'
+            installer_ip: '172.30.10.73'
+        - orange-build:
+            node: 'orange-build'
+            installer_type: 'foreman'
+            installer_ip: '172.30.10.73'
     jobs:
         - 'functest-{pod}'
-        - 'functest-openstack-bench-test'
-        - 'functest-openstack-tempest-smoke-test'
-        - 'functest-odl-test'
-        - 'functest-vims-test'
-        - 'functest-vping-test'
-        - 'functest-daily-master'
+        - '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-{stream}'
 
@@ -23,8 +34,10 @@
     stream:
         - master:
             branch: 'master'
+            gs-pathname: ''
         - stable-arno:
             branch: 'stable/arno'
+            gs-pathname: '/arno'
 
     project: 'functest'
     somevar: 'foo'
@@ -32,11 +45,46 @@
 # job template
 ################################
 - job-template:
-    name: functest-openstack-bench-test
+    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 openstack vars
+            if [[ ! -f $HOME/opnfv-openrc.sh ]]; then
+                echo "Unable to access file $HOME/opnfv-openrc.sh"
+                exit 1
+            fi
+            source $HOME/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: clean-functest-env-{pod}
 
     project-type: freestyle
 
-    node: opnfv-jump-2
+    node: '{pod}'
 
     logrotate:
         daysToKeep: 30
@@ -46,14 +94,28 @@
 
     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-tempest-smoke-test
+    name: functest-openstack-bench-test-{pod}
 
     project-type: freestyle
 
-    node: opnfv-jump-2
+    node: '{pod}'
 
     logrotate:
         daysToKeep: 30
@@ -63,15 +125,41 @@
 
     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-{pod}
+
+    project-type: freestyle
+
+    node: '{pod}'
+
+    logrotate:
+        daysToKeep: 30
+        numToKeep: 10
+        artifactDaysToKeep: -1
+        artifactNumToKeep: -1
+
+    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
@@ -81,14 +169,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
@@ -102,11 +194,11 @@
 
 
 - job-template:
-    name: functest-vping-test
+    name: functest-vping-test-{pod}
 
     project-type: freestyle
 
-    node: opnfv-jump-2
+    node: '{pod}'
 
     logrotate:
         daysToKeep: 30
@@ -116,7 +208,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}
@@ -128,6 +225,15 @@
     parameters:
         - project-parameter:
             project: '{project}'
+        - string:
+            name: INSTALLER_TYPE
+            default: '{installer_type}'
+            description: "Installer name that is used for deployment."
+        - string:
+            name: INSTALLER_IP
+            default: '{installer_ip}'
+            description: "Installer IP."
+        - '{pod}'
 
     scm:
         - git-scm:
@@ -142,10 +248,13 @@
         artifactNumToKeep: -1
 
     builders:
+        - 'functest-fetch-os-creds'
         - 'functest-all'
+        - 'functest-store-results'
+        - 'functest-cleanup'
 
 - job-template:
-    name: 'functest-daily-master'
+    name: 'functest-daily-{stream}'
 
     node: master
 
@@ -167,26 +276,28 @@
     parameters:
         - project-parameter:
             project: '{project}'
+        - functest-parameter:
+            gs-pathname: '{gs-pathname}'
 
     scm:
         - git-scm:
             credentials-id: '{ssh-credentials}'
             refspec: ''
-            branch: master
+            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
@@ -240,7 +351,7 @@
 
     builders:
         - shell:
-            !include-raw docu-verify.sh
+            !include-raw ../opnfvdocs/docu-build.sh
 
 - job-template:
     name: 'functest-merge'
@@ -290,8 +401,58 @@
 
     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"
 
+- parameter:
+    name: orange-build
+    parameters:
+        - string:
+            name: GIT_BASE
+            default: https://gerrit.opnfv.org/gerrit/$PROJECT
+            description: "Override GIT_BASE"
+
+- parameter:
+    name: opnfv-jump-1
+    parameters:
+        - string:
+            name: GIT_BASE
+            default: ssh://gerrit.opnfv.org:29418/$PROJECT
+            description: "Override GIT_BASE"
+
+- parameter:
+    name: opnfv-jump-2
+    parameters:
+        - string:
+            name: GIT_BASE
+            default: ssh://gerrit.opnfv.org:29418/$PROJECT
+            description: "Override GIT_BASE"
+########################
+# trigger macros
+########################
+- trigger:
+    name: 'functest-master'
+    triggers:
+        - pollscm: "H 9 * * *"
+
+- trigger:
+    name: 'functest-stable-arno'
+    triggers:
+        - pollscm: "H 21 * * *"
+
+########################
+# builder macros
+########################
 # macros
 - builder:
     name: functest-all
@@ -320,21 +481,43 @@
             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
+
             # tempest
             echo "Functest: run Tempest suite"
             rally verify start smoke
             rally verify list
 
-            # rally
-            echo "Functest: run Functest Rally Bench suites"
-            python $WORKSPACE/testcases/VIM/OpenStack/CI/libraries/run_rally.py --debug $WORKSPACE/ all
-
             # collect results
             echo "Functest: copy results and clean Functest environment"
             mkdir -p $HOME/functest/results
 
+            # save ODL results
+            cp -Rf $WORKSPACE/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: |
+            #!/bin/bash
+            set +e
+
             # cleanup
             python $WORKSPACE/testcases/config_functest.py --debug --force $WORKSPACE/ clean
+
+- builder:
+    name: functest-fetch-os-creds
+    builders:
+        - shell:
+            !include-raw ../../utils/fetch_os_creds.sh