X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Ffunctest%2Ffunctest-ci-jobs.yml;h=1165b2a2c0bd16fdb831c3e2fc0c2c7d94d20a45;hb=dc5bb9cb2a59aeeede763f988f1559ac4e2ba8c2;hp=1d43e987d6e01636add2a06335059f5fa5a41f0e;hpb=e1fb68f66fa673b1db8dc36d9790b1a0cd2b3b21;p=releng.git

diff --git a/jjb/functest/functest-ci-jobs.yml b/jjb/functest/functest-ci-jobs.yml
index 1d43e987d..1165b2a2c 100644
--- 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 Scenario: $DEPLOY_SCENARIO'
+        - timeout:
+            timeout: 210
+            abort: true
 
     parameters:
         - project-parameter:
@@ -81,6 +121,9 @@
         - '{pod}-defaults'
         - '{installer}-defaults'
         - 'functest-{testsuite}-parameter'
+        - string:
+            name: DEPLOY_SCENARIO
+            default: 'os-odl_l2-nofeature-ha'
         - functest-parameter:
             gs-pathname: '{gs-pathname}'
 
@@ -112,6 +155,10 @@
                 - 'tempest'
                 - 'rally'
                 - 'odl'
+                - 'onos'
+                - 'ovno'
+                - 'promise'
+                - 'doctor'
                 - 'vims'
                 - 'vping'
 - parameter:
@@ -132,7 +179,7 @@
         - string:
             name: CI_DEBUG
             default: 'false'
-            description: "Show debut output information"
+            description: "Show debug output information"
 ########################
 # trigger macros
 ########################
@@ -177,7 +224,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
@@ -188,8 +234,7 @@
         - shell: |
             #!/bin/bash
             set +e
-            [[ $CI_DEBUG == true ]] && redirect="" || redirect=">/dev/null"
-
+            [[ $CI_DEBUG == true ]] && redirect="/dev/stdout" || redirect="/dev/null"
             # labconfig is used only for joid
             labconfig=""
             if [[ ${INSTALLER_TYPE} == 'apex' ]]; then
@@ -210,19 +255,19 @@
             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}"
-
-            dir_result="${HOME}/opnfv/functest/reports"
+            branch=${GIT_BRANCH##*/}
+            dir_result="${HOME}/opnfv/functest/results/${branch}"
             mkdir -p ${dir_result}
-            rm -rf ${dir_result}/*
+            sudo rm -rf ${dir_result}/*
             res_volume="-v ${dir_result}:/home/opnfv/functest/results"
 
-            docker pull opnfv/functest:latest_stable $redirect
-            cmd="sudo docker run --privileged=true -id ${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."
@@ -233,7 +278,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
@@ -245,21 +290,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="" || redirect=">/dev/null"
+            [[ $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 $redirect
-                docker ps -a | grep opnfv/functest | awk '{print $1}' | xargs docker rm $redirect
+                docker ps -a | grep opnfv/functest | awk '{print $1}' | xargs docker rm -f >$redirect
             fi
 
             # Remove existing images if exist
@@ -269,6 +313,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 $redirect
+                    docker rmi opnfv/functest:$tag >$redirect
                 done
             fi