X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Ffunctest%2Ffunctest.yml;h=346b678ace2ba6a96e6a3a9e452dd9e0c2fd4f58;hb=b24d31936e464bfcfb8dd45e88254116842fbcb0;hp=53da3eec5147b34ed3c023a6535e2a52cf2e0bb7;hpb=74810a83844602e82d4e5d70ac866b53fbdf5d3d;p=releng.git

diff --git a/jjb/functest/functest.yml b/jjb/functest/functest.yml
index 53da3eec5..346b678ac 100644
--- a/jjb/functest/functest.yml
+++ b/jjb/functest/functest.yml
@@ -4,328 +4,68 @@
 - project:
     name: functest
 
-    installer:
-        - fuel:
-            node: 'opnfv-jump-2'
-            installer_type: 'fuel'
-            installer_ip: '10.20.0.2'
-        - foreman:
-            node: 'opnfv-jump-2'
-            installer_type: 'foreman'
-            installer_ip: '172.30.10.73'
-        - apex:
-            node: 'opnfv-jump-1'
-            installer_type: 'apex'
-            installer_ip: '192.168.X.X'
+    project: '{name}'
+
     pod:
-        - orange-build:
-            node: 'orange-build'
-            installer_type: 'foreman'
-            installer_ip: '172.30.10.73'
+        - opnfv-jump-1:
+            installer: apex
+        - opnfv-jump-2:
+            installer: fuel
+        - orange-test1:
+            installer: fuel
+        - orange-pod2:
+            installer: joid
+        - huawei-us-deploy-bare-1:
+            installer: compass
+        - intel-pod5:
+            installer: joid
+
+    testsuite:
+        - 'daily'
+        - 'suite'
 
     jobs:
-        - 'set-functest-env-{pod}'
-        - 'functest-{pod}'
-        - 'clean-functest-env-{pod}'
-        - 'set-functest-env-{installer}-{stream}'
-        - 'functest-{installer}-{stream}'
-        - 'clean-functest-env-{installer}-{stream}'
-        - 'functest-openstack-bench-test-{pod}'
-        - 'functest-openstack-tempest-smoke-test-{pod}'
-        - 'functest-odl-test-{pod}'
-        - 'functest-vims-{installer}-{stream}'
-        - 'functest-vping-test-{pod}'
-        - 'functest-daily-{stream}'
-        - 'functest-merge-{stream}'
+        - 'functest-{installer}-{pod}-{testsuite}-{stream}'
         - 'functest-verify-{stream}'
 
-    # 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'
+#        - brahmaputra:
+#            branch: 'stable/brahmaputra'
+#            gs-pathname: '/brahmaputra'
 
-    project: 'functest'
-    somevar: 'foo'
 ################################
 # job template
 ################################
 - job-template:
-    name: set-functest-env-{pod}
-
-    node: '{pod}'
-
-    logrotate:
-        daysToKeep: 30
-        numToKeep: 10
-        artifactDaysToKeep: -1
-        artifactNumToKeep: -1
-
-    builders:
-        - 'set-functest-env'
-
-- job-template:
-    name: clean-functest-env-{pod}
-
-    node: '{pod}'
-
-    logrotate:
-        daysToKeep: 30
-        numToKeep: 10
-        artifactDaysToKeep: -1
-        artifactNumToKeep: -1
-
-    builders:
-        - 'functest-cleanup'
-
-- job-template:
-    name: set-functest-env-{installer}-{stream}
-
-    node: '{node}'
-
-    logrotate:
-        daysToKeep: 30
-        numToKeep: 10
-        artifactDaysToKeep: -1
-        artifactNumToKeep: -1
-
-    builders:
-        - 'set-functest-env'
-
-- job-template:
-    name: clean-functest-env-{installer}-{stream}
-
-    node: '{node}'
-
-    logrotate:
-        daysToKeep: 30
-        numToKeep: 10
-        artifactDaysToKeep: -1
-        artifactNumToKeep: -1
-
-    builders:
-        - 'functest-cleanup'
-
-- job-template:
-    name: functest-openstack-bench-test-{pod}
-
-    node: '{pod}'
-
-    logrotate:
-        daysToKeep: 30
-        numToKeep: 10
-        artifactDaysToKeep: -1
-        artifactNumToKeep: -1
-
-    builders:
-        - 'functest-rally-bench'
-
-- job-template:
-    name: functest-openstack-tempest-smoke-test-{pod}
-
-    node: '{pod}'
-
-    logrotate:
-        daysToKeep: 30
-        numToKeep: 10
-        artifactDaysToKeep: -1
-        artifactNumToKeep: -1
-
-    builders:
-        - 'functest-tempest-smoke'
-
-- job-template:
-    name: functest-odl-test-{pod}
-
-    node: '{pod}'
-
-    logrotate:
-        daysToKeep: 30
-        numToKeep: 10
-        artifactDaysToKeep: -1
-        artifactNumToKeep: -1
-
-    builders:
-        - shell: |
-        - 'functest-odl'
-
-- job-template:
-    name: functest-vping-test-{pod}
-
-    node: '{pod}'
+    name: 'functest-{installer}-{pod}-{testsuite}-{stream}'
 
-    logrotate:
-        daysToKeep: 30
-        numToKeep: 10
-        artifactDaysToKeep: -1
-        artifactNumToKeep: -1
-
-    builders:
-        - 'functest-vping'
-
-- job-template:
-    name: functest-{pod}
-
-    node: '{pod}'
+    wrappers:
+        - build-name:
+            name: '$BUILD_NUMBER: $FUNCTEST_SUITE_NAME'
 
     parameters:
         - project-parameter:
             project: '{project}'
+        - '{pod}-defaults'
+        - '{installer}-defaults'
+        - 'functest-{testsuite}-parameter'
         - functest-parameter
-        - 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:
             credentials-id: '{ssh-credentials}'
             refspec: ''
-            branch: master
-
-    logrotate:
-        daysToKeep: 30
-        numToKeep: 10
-        artifactDaysToKeep: -1
-        artifactNumToKeep: -1
-
-    builders:
-        - 'functest-cleanup'
-        - 'set-functest-env'
-        - 'functest-all'
-        - 'functest-store-results'
-
-- job-template:
-    name: functest-{installer}-{stream}
-
-    node: '{node}'
-
-    parameters:
-        - project-parameter:
-            project: '{project}'
-        - functest-parameter
-        - 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."
-        - string:
-            name: GIT_BASE
-            default: ssh://gerrit.opnfv.org:29418/$PROJECT
-            description: "Override GIT_BASE"
-
-    scm:
-        - git-scm:
-            credentials-id: '{ssh-credentials}'
-            refspec: ''
-            branch: master
-
-    logrotate:
-        daysToKeep: 30
-        numToKeep: 10
-        artifactDaysToKeep: -1
-        artifactNumToKeep: -1
-
-    builders:
-        - 'functest-cleanup'
-        - 'set-functest-env'
-        - 'functest-all'
-        - 'functest-store-results'
-
-- job-template:
-    name: functest-vims-{installer}-{stream}
-
-    node: '{node}'
-
-    parameters:
-        - project-parameter:
-            project: '{project}'
-        - functest-parameter
-        - 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."
-        - string:
-            name: GIT_BASE
-            default: ssh://gerrit.opnfv.org:29418/$PROJECT
-            description: "Override GIT_BASE"
-
-    scm:
-        - git-scm:
-            credentials-id: '{ssh-credentials}'
-            refspec: ''
-            branch: master
-
-    logrotate:
-        daysToKeep: 30
-        numToKeep: 10
-        artifactDaysToKeep: -1
-        artifactNumToKeep: -1
-
-    builders:
-        - 'functest-vims'
-
-- job-template:
-    name: 'functest-daily-{stream}'
-
-    # Job template for daily builders
-    #
-    # Required Variables:
-    #     stream:    branch with - in place of / (eg. stable)
-    #     branch:    branch (eg. stable)
-
-    varsetabove: '{somevar}'
-
-    parameters:
-        - project-parameter:
-            project: '{project}'
-        - functest-parameter:
-            gs-pathname: '{gs-pathname}'
-
-    scm:
-        - git-scm:
-            credentials-id: '{ssh-credentials}'
-            refspec: ''
-            branch: '{stream}'
-
-    triggers:
-        - 'functest-{stream}'
-
-    prebuilders:
-        - test-macro
+            branch: '{branch}'
 
     builders:
-        - shell:
-            !include-raw ../opnfvdocs/docu-build.sh
-
-    postbuilders:
-        - test-macro
+        - 'functest-{testsuite}-builder'
 
 - job-template:
     name: 'functest-verify-{stream}'
 
-    logrotate:
-        daysToKeep: 30
-        numToKeep: 10
-        artifactDaysToKeep: -1
-        artifactNumToKeep: -1
-
     parameters:
         - project-parameter:
             project: '{project}'
@@ -357,48 +97,30 @@
                     branch-pattern: '**/{branch}'
 
     builders:
-        - shell:
-            !include-raw ../opnfvdocs/docu-build.sh
-
-- job-template:
-    name: 'functest-merge-{stream}'
-
-    # builder-merge job to run JJB update
-    #
-    # This job's purpose is to update all the JJB
-
-    parameters:
-        - project-parameter:
-            project: '{project}'
-        - gerrit-parameter:
-            branch: '{branch}'
-
-    scm:
-        - gerrit-trigger-scm:
-            credentials-id: '{ssh-credentials}'
-            refspec: ''
-            choosing-strategy: 'default'
-
-    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: '**/{branch}'
-
-    builders:
-        - shell:
-            !include-raw ../opnfvdocs/docu-build.sh
+        - shell: |
+            echo "Nothing to verify!"
 
 ########################
 # parameter macros
 ########################
+- parameter:
+    name: functest-daily-parameter
+    parameters:
+        - string:
+            name: FUNCTEST_SUITE_NAME
+            default: 'daily'
+            description: "Suite name to run"
+- parameter:
+    name: functest-suite-parameter
+    parameters:
+        - choice:
+            name: FUNCTEST_SUITE_NAME
+            choices:
+                - 'tempest'
+                - 'rally'
+                - 'odl'
+                - 'vims'
+                - 'vping'
 - parameter:
     name: functest-parameter
     parameters:
@@ -410,30 +132,10 @@
             name: FUNCTEST_REPO_DIR
             default: "/home/opnfv/repos/functest"
             description: "Directory where the Functest repository is cloned"
-
-- 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"
+            name: PUSH_RESULTS_TO_DB
+            default: "true"
+            description: "Push the results of all the tests to the resultDB"
 ########################
 # trigger macros
 ########################
@@ -441,25 +143,44 @@
     name: 'functest-master'
     triggers:
         - pollscm: "H 9 * * *"
-
-- trigger:
-    name: 'functest-stable-arno'
-    triggers:
-        - pollscm: "H 21 * * *"
-
 ########################
 # builder macros
 ########################
-# macros
 - builder:
-    name: functest-all
+    name: functest-daily-builder
+    builders:
+        - 'functest-cleanup'
+        - 'set-functest-env'
+        - 'functest-all'
+        - 'functest-store-results'
+
+- builder:
+    name: functest-suite-builder
     builders:
         - shell: |
             #!/bin/bash
             set +e
+            flag=""
+            if [ "${PUSH_RESULTS_TO_DB}" == "true" ]; then
+                flag="-r"
+            fi
+            echo "Functest: run $FUNCTEST_SUITE_NAME"
+            cmd="${FUNCTEST_REPO_DIR}/docker/run_tests.sh --test $FUNCTEST_SUITE_NAME ${flag}"
+            container_id=$(docker ps -a | grep opnfv/functest | awk '{print $1}' | head -1)
+            docker exec $container_id $cmd
 
+- builder:
+    name: functest-all
+    builders:
+        - shell: |
+            #!/bin/bash
+            set +e
+            flag=""
+            if [ "${PUSH_RESULTS_TO_DB}" == "true" ]; then
+                flag="-r"
+            fi
             echo "Functest: running all the tests"
-            cmd="${FUNCTEST_REPO_DIR}/docker/run_tests.sh"
+            cmd="${FUNCTEST_REPO_DIR}/docker/run_tests.sh ${flag}"
             container_id=$(docker ps -a | grep opnfv/functest | awk '{print $1}' | head -1)
             docker exec $container_id $cmd
 
@@ -469,15 +190,36 @@
         - shell: |
             #!/bin/bash
             set +e
+            # labconfig is used only for joid
+            labconfig=""
             if [[ ${INSTALLER_TYPE} == 'apex' ]]; then
-                INSTALLER_IP=$(cat instack /var/lib/libvirt/dnsmasq/default.leases \
-                    |sed 's/.*192/192/g' | sed 's/\ in.*//g')
+                INSTALLER_IP=$(grep instack /var/lib/libvirt/dnsmasq/default.leases \
+                    |awk '{print $3}' | head -n 1)
+                sshkey="-v /root/.ssh/id_rsa:/root/.ssh/id_rsa"
+                sudo iptables -D FORWARD -o virbr0 -j REJECT --reject-with icmp-port-unreachable
+                sudo iptables -D FORWARD -i virbr0 -j REJECT --reject-with icmp-port-unreachable
+            elif [[ ${INSTALLER_TYPE} == 'joid' ]]; then
+                # If production lab then creds may be retrieved dynamically
+                # creds are on the jumphost, always in the same folder
+                labconfig="-v /home/ubuntu/joid/ci/cloud/admin-openrc:/home/opnfv/functest/conf/openstack.creds"
+                # If dev lab, credentials may not be the default ones, just provide a path to put them into docker
+                # replace the default one by the customized one provided by jenkins config
+                if [ -n "${LAB_CONFIG}" ]; then
+                    labconfig="-v ${LAB_CONFIG}:/home/opnfv/functest/conf/openstack.creds"
+                fi
             fi
             echo "Functest: Start Docker and prepare environment"
-            envs="INSTALLER_TYPE=${INSTALLER_TYPE} -e INSTALLER_IP=${INSTALLER_IP}"
+            envs="INSTALLER_TYPE=${INSTALLER_TYPE} -e INSTALLER_IP=${INSTALLER_IP} -e NODE_NAME=${NODE_NAME}"
+
+            dir_result="${HOME}/opnfv/functest/reports"
+            mkdir -f ${dir_result}
+            rm -rf ${dir_result}/*
+            $res_volume="-v ${dir_result}:/home/opnfv/functest/results"
+
             docker pull opnfv/functest:latest_stable
-            echo "Functest: Running docker run command: docker run -i -e $envs opnfv/functest /bin/bash &"
-            docker run -i -e $envs opnfv/functest:latest_stable /bin/bash &
+            cmd="docker run -id -e $envs ${labconfig} ${sshkey} ${res_volume} opnfv/functest:latest_stable /bin/bash"
+            echo "Functest: Running docker run command: ${cmd}"
+            ${cmd}
             docker ps -a
             sleep 5
             container_id=$(docker ps | grep 'opnfv/functest:latest_stable' | awk '{print $1}' | head -1)
@@ -499,67 +241,6 @@
             echo "Executing command inside the docker: ${cmd}"
             docker exec ${container_id} ${cmd}
 
-- builder:
-    name: functest-vping
-    builders:
-        - shell: |
-            #!/bin/bash
-            set +e
-
-            echo "Functest: run vPing"
-            cmd="${FUNCTEST_REPO_DIR}/docker/run_tests.sh --test vping"
-            container_id=$(docker ps -a | grep opnfv/functest | awk '{print $1}' | head -1)
-            docker exec $container_id $cmd
-
-- builder:
-    name: functest-odl
-    builders:
-        - shell: |
-            #!/bin/bash
-            set +e
-
-            echo "Functest: run ODL suite"
-            cmd="${FUNCTEST_REPO_DIR}/docker/run_tests.sh --test odl"
-            container_id=$(docker ps -a | grep opnfv/functest | awk '{print $1}' | head -1)
-            docker exec $container_id $cmd
-
-- builder:
-    name: functest-tempest-smoke
-    builders:
-        - shell: |
-            #!/bin/bash
-            set +e
-
-            # tempest
-            echo "Functest: run Tempest suite"
-            cmd="${FUNCTEST_REPO_DIR}/docker/run_tests.sh --test tempest"
-            container_id=$(docker ps -a | grep opnfv/functest | awk '{print $1}' | head -1)
-            docker exec $container_id $cmd
-
-- builder:
-    name: functest-rally-bench
-    builders:
-        - shell: |
-            #!/bin/bash
-            set +e
-
-            echo "Functest: run Functest Rally Bench suites"
-            cmd="${FUNCTEST_REPO_DIR}/docker/run_tests.sh --test rally"
-            container_id=$(docker ps -a | grep opnfv/functest | awk '{print $1}' | head -1)
-            docker exec $container_id $cmd
-
-- builder:
-    name: functest-vims
-    builders:
-        - shell: |
-            #!/bin/bash
-            set +e
-
-            echo "Functest: run Functest vIMS test"
-            cmd="${FUNCTEST_REPO_DIR}/docker/run_tests.sh --test vims"
-            container_id=$(docker ps -a | grep opnfv/functest | awk '{print $1}' | head -1)
-            docker exec $container_id $cmd
-
 - builder:
     name: functest-store-results
     builders: