Code Review / releng.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | inline | side by side
Apex, Functest: fixes missing sudo when searching for VM
[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 4152193..79a5cab 100644 (file)
--- a/jjb/functest/functest-ci-jobs.yml
+++ b/jjb/functest/functest-ci-jobs.yml
@@ -13,28 +13,39 @@
         stream: master
         branch: '{stream}'
         gs-pathname: ''
+        docker-tag: 'latest'
     brahmaputra: &brahmaputra
         stream: brahmaputra
         branch: 'stable/{stream}'
         gs-pathname: '/{stream}'
+        docker-tag: 'stable'
 #--------------------------------
 # 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
@@ -47,21 +58,21 @@
 #--------------------------------
 #        master
 #--------------------------------
+        - opnfv-jump-2:
+            installer: fuel
+            <<: *master
         - intel-pod6:
             installer: joid
             <<: *master
         - intel-pod8:
             installer: compass
             <<: *master
-        - opnfv-jump-1:
+        - intel-pod7:
             installer: apex
             <<: *master
         - ericsson-pod1:
             installer: fuel
             <<: *master
-        - ericsson-pod2:
-            installer: fuel
-            <<: *master
         - orange-test1:
             installer: fuel
             <<: *master
@@ -77,6 +88,12 @@
         - virtual:
             installer: joid
             <<: *master
+        - huawei-us-deploy-bare-2:
+            installer: compass
+            <<: *master
+        - nokia-pod1:
+            installer: apex
+            <<: *master
 #--------------------------------
 
     testsuite:
@@ -102,6 +119,9 @@
     wrappers:
         - build-name:
             name: '$BUILD_NUMBER Suite: $FUNCTEST_SUITE_NAME Scenario: $DEPLOY_SCENARIO'
+        - timeout:
+            timeout: 400
+            abort: true
 
     parameters:
         - project-parameter:
@@ -112,6 +132,10 @@
         - 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}'
 
@@ -122,6 +146,8 @@
             branch: '{branch}'
 
     builders:
+        - 'functest-cleanup'
+        - 'set-functest-env'
         - 'functest-{testsuite}-builder'
 
 ########################
@@ -148,7 +174,8 @@
                 - 'promise'
                 - 'doctor'
                 - 'vims'
-                - 'vping'
+                - 'vping_userdata'
+                - 'vping_ssh'
 - parameter:
     name: functest-parameter
     parameters:
@@ -193,12 +220,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
 
@@ -208,12 +233,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
 
@@ -227,8 +249,16 @@
             # labconfig is used only for joid
             labconfig=""
             if [[ ${INSTALLER_TYPE} == 'apex' ]]; then
-                instack_mac=$(sudo virsh domiflist instack | grep default | \
-                              grep -Eo "[0-9a-f]+:[0-9a-f]+:[0-9a-f]+:[0-9a-f]+:[0-9a-f]+:[0-9a-f]+")
+                if sudo virsh list | grep instack; then
+                    instack_mac=$(sudo virsh domiflist instack | grep default | \
+                                  grep -Eo "[0-9a-f]+:[0-9a-f]+:[0-9a-f]+:[0-9a-f]+:[0-9a-f]+:[0-9a-f]+")
+                elif sudo virsh list | grep undercloud; then
+                    instack_mac=$(sudo virsh domiflist undercloud | grep default | \
+                                  grep -Eo "[0-9a-f]+:[0-9a-f]+:[0-9a-f]+:[0-9a-f]+:[0-9a-f]+:[0-9a-f]+")
+                else
+                    echo "No available installer VM exists...exiting"
+                    exit 1
+                fi
                 INSTALLER_IP=$(/usr/sbin/arp -e | grep ${instack_mac} | awk {'print $1'})
                 sshkey="-v /root/.ssh/id_rsa:/root/.ssh/id_rsa"
                 sudo iptables -D FORWARD -o virbr0 -j REJECT --reject-with icmp-port-unreachable
@@ -243,20 +273,22 @@
             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}
             sudo rm -rf ${dir_result}/*
             res_volume="-v ${dir_result}:/home/opnfv/functest/results"
 
-            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: Pulling image opnfv/functest:${DOCKER_TAG}"
+            docker pull opnfv/functest:$DOCKER_TAG >${redirect}
+
+            cmd="sudo docker run --privileged=true -id ${envs} ${labconfig} ${sshkey} ${res_volume} opnfv/functest:${DOCKER_TAG} /bin/bash"
             echo "Functest: Running docker run command: ${cmd}"
-            ${cmd}
+            ${cmd} >${redirect}
             docker ps -a
             sleep 5
-            container_id=$(docker ps | grep 'opnfv/functest:latest' | awk '{print $1}' | head -1)
+            container_id=$(docker ps | grep "opnfv/functest:${DOCKER_TAG}" | 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."
@@ -267,7 +299,7 @@
             docker start ${container_id}
             sleep 5
             docker ps
-            if [ $(docker ps | grep 'opnfv/functest:latest' | wc -l) == 0 ]; then
+            if [ $(docker ps | grep "opnfv/functest:${DOCKER_TAG}" | wc -l) == 0 ]; then
                 echo "The container opnfv/functest with ID=${container_id} has not been properly started. Exiting..."
                 exit 1
             fi
@@ -279,7 +311,7 @@
     name: functest-store-results
     builders:
         - shell:
-            !include-raw: res-build.sh
+            !include-raw: ../../utils/push-test-logs.sh
 
 - builder:
     name: functest-cleanup
@@ -292,7 +324,7 @@
             # Remove previous running containers if exist
             if [[ ! -z $(docker ps -a | grep opnfv/functest) ]]; then
                 echo "Removing existing opnfv/functest containers..."
-                docker ps -a | grep opnfv/functest | awk '{print $1}' | xargs docker rm -f >$redirect
+                docker ps -a | grep opnfv/functest | awk '{print $1}' | xargs docker rm -f >${redirect}
             fi
 
             # Remove existing images if exist
@@ -302,6 +334,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