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 b7a75e8..2b28974 100644 (file)
--- a/jjb/functest/functest-ci-jobs.yml
+++ b/jjb/functest/functest-ci-jobs.yml
@@ -222,7 +222,12 @@
             #!/bin/bash
             set -e
             echo "Functest: run $FUNCTEST_SUITE_NAME"
-            cmd="${FUNCTEST_REPO_DIR}/docker/run_tests.sh --test $FUNCTEST_SUITE_NAME"
+            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
 
@@ -232,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
 
@@ -260,8 +269,12 @@
                 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
@@ -302,7 +315,11 @@
                 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}