Merge "Functest, differenciate commands for stable and for master"

[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 cb9d289..2b28974 100644 (file)
--- a/jjb/functest/functest-ci-jobs.yml
+++ b/jjb/functest/functest-ci-jobs.yml
@@ -18,7 +18,7 @@
         stream: brahmaputra
         branch: 'stable/{stream}'
         gs-pathname: '/{stream}'
-        docker-tag: 'brahmaputra.1.0'
+        docker-tag: 'stable'
 #--------------------------------
 # POD, INSTALLER, AND BRANCH MAPPING
 #--------------------------------
@@ -94,6 +94,9 @@
         - nokia-pod1:
             installer: apex
             <<: *master
+        - arm-pod1:
+            installer: fuel
+            <<: *master
 #--------------------------------
 
     testsuite:
@@ -217,11 +220,14 @@
     builders:
         - shell: |
             #!/bin/bash
-            set +e
-            flags="-s"
-            [[ "$PUSH_RESULTS_TO_DB" == "true" ]] && flags+=" -r"
+            set -e
             echo "Functest: run $FUNCTEST_SUITE_NAME"
-            cmd="${FUNCTEST_REPO_DIR}/docker/run_tests.sh --test $FUNCTEST_SUITE_NAME ${flags}"
+            branch=${GIT_BRANCH##*/}
+            if [[ "${branch}" == "master" ]]; then
+                cmd="${FUNCTEST_REPO_DIR}/ci/run_tests.py -t $FUNCTEST_SUITE_NAME"
+            else:
+                cmd="${FUNCTEST_REPO_DIR}/docker/run_tests.sh --test $FUNCTEST_SUITE_NAME"
+            fi
             container_id=$(docker ps -a | grep opnfv/functest | awk '{print $1}' | head -1)
             docker exec $container_id $cmd
 
@@ -231,9 +237,13 @@
         - shell: |
             #!/bin/bash
             set +e
-            flags="-s"
-            [[ "$PUSH_RESULTS_TO_DB" == "true" ]] && flags+=" -r"
-            cmd="${FUNCTEST_REPO_DIR}/docker/run_tests.sh ${flags}"
+            branch=${GIT_BRANCH##*/}
+            [[ "$PUSH_RESULTS_TO_DB" == "true" ]] && flags+="-r"
+            if [[ "${branch}" == "master" ]]; then
+                cmd="${FUNCTEST_REPO_DIR}/ci/run_tests.py -t all ${flags}"
+            else:
+                cmd="${FUNCTEST_REPO_DIR}/docker/run_tests.sh -s ${flags}"
+            fi
             container_id=$(docker ps -a | grep opnfv/functest | awk '{print $1}' | head -1)
             docker exec $container_id $cmd
 
@@ -242,17 +252,29 @@
     builders:
         - shell: |
             #!/bin/bash
-            set +e
+            set -e
             [[ $CI_DEBUG == true ]] && redirect="/dev/stdout" || redirect="/dev/null"
             # 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
-                sudo iptables -D FORWARD -i virbr0 -j REJECT --reject-with icmp-port-unreachable
+                if sudo iptables -C FORWARD -o virbr0 -j REJECT --reject-with icmp-port-unreachable 2> ${redirect}; then
+                    sudo iptables -D FORWARD -o virbr0 -j REJECT --reject-with icmp-port-unreachable
+                fi
+                if sudo iptables -C FORWARD -i virbr0 -j REJECT --reject-with icmp-port-unreachable 2> ${redirect}; then
+                    sudo iptables -D FORWARD -i virbr0 -j REJECT --reject-with icmp-port-unreachable
+                fi
             elif [[ ${INSTALLER_TYPE} == 'joid' ]]; then
                 # If production lab then creds may be retrieved dynamically
                 # creds are on the jumphost, always in the same folder
@@ -276,9 +298,9 @@
             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} >${redirect}
-            docker ps -a
+            docker ps -a >${redirect}
             sleep 5
-            container_id=$(docker ps | grep 'opnfv/functest:$DOCKER_TAG' | 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."
@@ -288,12 +310,16 @@
             echo "Starting the container: docker start ${container_id}"
             docker start ${container_id}
             sleep 5
-            docker ps
-            if [ $(docker ps | grep 'opnfv/functest:$DOCKER_TAG' | wc -l) == 0 ]; then
+            docker ps >${redirect}
+            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
-            cmd="${FUNCTEST_REPO_DIR}/docker/prepare_env.sh"
+            if [[ "${branch}" == "master" ]]; then
+                cmd="python ${FUNCTEST_REPO_DIR}/ci/prepare_env.py start"
+            else:
+                cmd="${FUNCTEST_REPO_DIR}/docker/prepare_env.sh"
+            fi
             echo "Executing command inside the docker: ${cmd}"
             docker exec ${container_id} ${cmd}
 
@@ -320,7 +346,7 @@
             # Remove existing images if exist
             if [[ ! -z $(docker images | grep opnfv/functest) ]]; then
                 echo "Docker images to remove:"
-                docker images | head -1 && docker images | grep opnfv/functest
+                docker images | head -1 && docker images | grep opnfv/functest >${redirect}
                 image_tags=($(docker images | grep opnfv/functest | awk '{print $2}'))
                 for tag in "${image_tags[@]}"; do
                     echo "Removing docker image opnfv/functest:$tag..."