Add jjob Functest timeout as input parameter, default 210

[releng.git] / jjb / functest / functest-ci-jobs.yml

diff --git a/jjb/functest/functest-ci-jobs.yml b/jjb/functest/functest-ci-jobs.yml
index 3c993c6..9b04b04 100644 (file)
--- a/jjb/functest/functest-ci-jobs.yml
+++ b/jjb/functest/functest-ci-jobs.yml
@@ -23,6 +23,9 @@
 #        brahmaputra
 #--------------------------------
     pod:
+        - opnfv-jump-1:
+            installer: apex
+            <<: *brahmaputra
         - opnfv-jump-2:
             installer: fuel
             <<: *brahmaputra
@@ -32,9 +35,27 @@
         - huawei-us-deploy-bare-1:
             installer: compass
             <<: *brahmaputra
+        - ericsson-pod1:
+            installer: fuel
+            <<: *brahmaputra
+        - ericsson-pod2:
+            installer: fuel
+            <<: *brahmaputra
+        - virtual:
+            installer: fuel
+            <<: *brahmaputra
+        - huawei-virtual:
+            installer: compass
+            <<: *brahmaputra
+        - virtual:
+            installer: joid
+            <<: *brahmaputra
 #--------------------------------
 #        master
 #--------------------------------
+        - opnfv-jump-2:
+            installer: fuel
+            <<: *master
         - intel-pod6:
             installer: joid
             <<: *master
@@ -56,6 +77,15 @@
         - orange-pod2:
             installer: joid
             <<: *master
+        - virtual:
+            installer: fuel
+            <<: *master
+        - huawei-virtual:
+            installer: compass
+            <<: *master
+        - virtual:
+            installer: joid
+            <<: *master
 #--------------------------------
 
     testsuite:
@@ -71,9 +101,19 @@
 - job-template:
     name: 'functest-{installer}-{pod}-{testsuite}-{stream}'
 
+    concurrent: true
+
+    properties:
+        - throttle:
+            enabled: true
+            max-per-node: 1
+
     wrappers:
         - build-name:
-            name: '$BUILD_NUMBER Suite: $FUNCTEST_SUITE_NAME SDN: $SDN_CONTROLLER Scenario: $DEPLOY_SCENARIO'
+            name: '$BUILD_NUMBER Suite: $FUNCTEST_SUITE_NAME Scenario: $DEPLOY_SCENARIO'
+        - timeout:
+            timeout: $JOB_TIMEOUT
+            abort: true
 
     parameters:
         - project-parameter:
@@ -81,8 +121,15 @@
         - '{pod}-defaults'
         - '{installer}-defaults'
         - 'functest-{testsuite}-parameter'
+        - string:
+            name: DEPLOY_SCENARIO
+            default: 'os-odl_l2-nofeature-ha'
         - functest-parameter:
             gs-pathname: '{gs-pathname}'
+        - string:
+            name: JOB_TIMEOUT
+            default: '210'
+            description: "Job build timeout"
 
     scm:
         - git-scm:
@@ -112,6 +159,10 @@
                 - 'tempest'
                 - 'rally'
                 - 'odl'
+                - 'onos'
+                - 'ovno'
+                - 'promise'
+                - 'doctor'
                 - 'vims'
                 - 'vping'
 - parameter:
@@ -129,13 +180,18 @@
             name: PUSH_RESULTS_TO_DB
             default: "true"
             description: "Push the results of all the tests to the resultDB"
+        - string:
+            name: CI_DEBUG
+            default: 'false'
+            description: "Show debug output information"
 ########################
 # trigger macros
 ########################
 - trigger:
     name: 'functest-master'
     triggers:
-        - pollscm: "H 9 * * *"
+        - pollscm:
+            cron: "H 9 * * *"
 ########################
 # builder macros
 ########################
@@ -172,7 +228,6 @@
             if [ "${PUSH_RESULTS_TO_DB}" == "true" ]; then
                 flag="-r"
             fi
-            echo "Functest: running all the tests"
             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
@@ -183,6 +238,7 @@
         - shell: |
             #!/bin/bash
             set +e
+            [[ $CI_DEBUG == true ]] && redirect="/dev/stdout" || redirect="/dev/null"
             # labconfig is used only for joid
             labconfig=""
             if [[ ${INSTALLER_TYPE} == 'apex' ]]; then
@@ -200,20 +256,22 @@
                 # replace the default one by the customized one provided by jenkins config
             fi
             echo "Functest: Start Docker and prepare environment"
-            envs="INSTALLER_TYPE=${INSTALLER_TYPE} -e INSTALLER_IP=${INSTALLER_IP} -e NODE_NAME=${NODE_NAME}"
-
-            dir_result="${HOME}/opnfv/functest/reports"
+            envs="-e INSTALLER_TYPE=${INSTALLER_TYPE} -e INSTALLER_IP=${INSTALLER_IP} \
+                -e NODE_NAME=${NODE_NAME} -e DEPLOY_SCENARIO=${DEPLOY_SCENARIO} \
+                -e CI_DEBUG=${CI_DEBUG}"
+            branch=${GIT_BRANCH##*/}
+            dir_result="${HOME}/opnfv/functest/results/${branch}"
             mkdir -p ${dir_result}
-            rm -rf ${dir_result}/*
-            $res_volume="-v ${dir_result}:/home/opnfv/functest/results"
+            sudo rm -rf ${dir_result}/*
+            res_volume="-v ${dir_result}:/home/opnfv/functest/results"
 
-            docker pull opnfv/functest:latest_stable
-            cmd="sudo docker run --privileged=true -id -e $envs ${labconfig} ${sshkey} ${res_volume} opnfv/functest:latest_stable /bin/bash"
+            docker pull opnfv/functest:latest >$redirect
+            cmd="sudo docker run --privileged=true -id ${envs} ${labconfig} ${sshkey} ${res_volume} opnfv/functest:latest /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)
+            container_id=$(docker ps | grep 'opnfv/functest:latest' | awk '{print $1}' | head -1)
             echo "Container ID=${container_id}"
             if [ -z ${container_id} ]; then
                 echo "Cannot find opnfv/functest container ID ${container_id}. Please check if it is existing."
@@ -224,7 +282,7 @@
             docker start ${container_id}
             sleep 5
             docker ps
-            if [ $(docker ps | grep 'opnfv/functest:latest_stable' | wc -l) == 0 ]; then
+            if [ $(docker ps | grep 'opnfv/functest:latest' | wc -l) == 0 ]; then
                 echo "The container opnfv/functest with ID=${container_id} has not been properly started. Exiting..."
                 exit 1
             fi
@@ -236,21 +294,20 @@
     name: functest-store-results
     builders:
         - shell:
-            !include-raw res-build.sh
+            !include-raw: ../../utils/push-test-logs.sh
 
 - builder:
     name: functest-cleanup
     builders:
         - shell: |
             #!/bin/bash
+            [[ $CI_DEBUG == true ]] && redirect="/dev/stdout" || redirect="/dev/null"
 
             echo "Cleaning up docker containers/images..."
-
             # Remove previous running containers if exist
             if [[ ! -z $(docker ps -a | grep opnfv/functest) ]]; then
                 echo "Removing existing opnfv/functest containers..."
-                docker ps | grep opnfv/functest | awk '{print $1}' | xargs docker stop
-                docker ps -a | grep opnfv/functest | awk '{print $1}' | xargs docker rm
+                docker ps -a | grep opnfv/functest | awk '{print $1}' | xargs docker rm -f >$redirect
             fi
 
             # Remove existing images if exist
@@ -260,6 +317,6 @@
                 image_tags=($(docker images | grep opnfv/functest | awk '{print $2}'))
                 for tag in "${image_tags[@]}"; do
                     echo "Removing docker image opnfv/functest:$tag..."
-                    docker rmi opnfv/functest:$tag
+                    docker rmi opnfv/functest:$tag >$redirect
                 done
             fi