X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Ffunctest%2Ffunctest-ci-jobs.yml;h=57f48109b68a8a759f77702a8ce03b49f9591128;hb=ad2b25fede33a89f33e3910c3791962bed033988;hp=ee6e7d6b7dd75f7e616de48c8d17390567f9d98d;hpb=e398ac7351a2db178f85fba804bbb75c1799c932;p=releng.git

diff --git a/jjb/functest/functest-ci-jobs.yml b/jjb/functest/functest-ci-jobs.yml
index ee6e7d6b7..57f48109b 100644
--- a/jjb/functest/functest-ci-jobs.yml
+++ b/jjb/functest/functest-ci-jobs.yml
@@ -13,28 +13,54 @@
         stream: master
         branch: '{stream}'
         gs-pathname: ''
+        docker-tag: 'latest'
     brahmaputra: &brahmaputra
         stream: brahmaputra
         branch: 'stable/{stream}'
         gs-pathname: '/{stream}'
+        docker-tag: 'brahmaputra.1.0'
 #--------------------------------
 # POD, INSTALLER, AND BRANCH MAPPING
 #--------------------------------
 #        brahmaputra
 #--------------------------------
     pod:
-        - opnfv-jump-2:
-            installer: fuel
+        - opnfv-jump-1:
+            installer: apex
             <<: *brahmaputra
         - intel-pod5:
             installer: joid
             <<: *brahmaputra
+        - orange-pod2:
+            installer: joid
+            <<: *brahmaputra
         - huawei-us-deploy-bare-1:
             installer: compass
             <<: *brahmaputra
+        - ericsson-pod1:
+            installer: fuel
+            <<: *brahmaputra
+        - ericsson-pod2:
+            installer: fuel
+            <<: *brahmaputra
+        - opnfv-jump-2:
+            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
@@ -47,15 +73,27 @@
         - ericsson-pod1:
             installer: fuel
             <<: *master
-        - ericsson-pod2:
-            installer: fuel
-            <<: *master
         - orange-test1:
             installer: fuel
             <<: *master
         - orange-pod2:
             installer: joid
             <<: *master
+        - virtual:
+            installer: fuel
+            <<: *master
+        - huawei-virtual:
+            installer: compass
+            <<: *master
+        - virtual:
+            installer: joid
+            <<: *master
+        - huawei-us-deploy-bare-2:
+            installer: compass
+            <<: *master
+        - nokia-pod1:
+            installer: apex
+            <<: *master
 #--------------------------------
 
     testsuite:
@@ -71,9 +109,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: 400
+            abort: true
 
     parameters:
         - project-parameter:
@@ -81,6 +129,13 @@
         - '{pod}-defaults'
         - '{installer}-defaults'
         - 'functest-{testsuite}-parameter'
+        - string:
+            name: DEPLOY_SCENARIO
+            default: 'os-odl_l2-nofeature-ha'
+        - string:
+            name: DOCKER_TAG
+            default: '{docker-tag}'
+            description: 'Tag to pull docker image'
         - functest-parameter:
             gs-pathname: '{gs-pathname}'
 
@@ -112,6 +167,10 @@
                 - 'tempest'
                 - 'rally'
                 - 'odl'
+                - 'onos'
+                - 'ovno'
+                - 'promise'
+                - 'doctor'
                 - 'vims'
                 - 'vping'
 - parameter:
@@ -132,7 +191,7 @@
         - string:
             name: CI_DEBUG
             default: 'false'
-            description: "Show debut output information"
+            description: "Show debug output information"
 ########################
 # trigger macros
 ########################
@@ -158,12 +217,10 @@
         - shell: |
             #!/bin/bash
             set +e
-            flag=""
-            if [ "${PUSH_RESULTS_TO_DB}" == "true" ]; then
-                flag="-r"
-            fi
+            flags="-s"
+            [[ "$PUSH_RESULTS_TO_DB" == "true" ]] && flags+=" -r"
             echo "Functest: run $FUNCTEST_SUITE_NAME"
-            cmd="${FUNCTEST_REPO_DIR}/docker/run_tests.sh --test $FUNCTEST_SUITE_NAME ${flag}"
+            cmd="${FUNCTEST_REPO_DIR}/docker/run_tests.sh --test $FUNCTEST_SUITE_NAME ${flags}"
             container_id=$(docker ps -a | grep opnfv/functest | awk '{print $1}' | head -1)
             docker exec $container_id $cmd
 
@@ -173,12 +230,9 @@
         - 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 ${flag}"
+            flags="-s"
+            [[ "$PUSH_RESULTS_TO_DB" == "true" ]] && flags+=" -r"
+            cmd="${FUNCTEST_REPO_DIR}/docker/run_tests.sh ${flags}"
             container_id=$(docker ps -a | grep opnfv/functest | awk '{print $1}' | head -1)
             docker exec $container_id $cmd
 
@@ -208,20 +262,20 @@
             echo "Functest: Start Docker and prepare environment"
             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"
+                -e BUILD_TAG=${BUILD_TAG} -e CI_DEBUG=${CI_DEBUG}"
+            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:$DOCKER_TAG >$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."
@@ -232,7 +286,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
@@ -244,7 +298,7 @@
     name: functest-store-results
     builders:
         - shell:
-            !include-raw: res-build.sh
+            !include-raw: ../../utils/push-test-logs.sh
 
 - builder:
     name: functest-cleanup