X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Ffunctest%2Ffunctest-alpine.sh;h=c82147489def4e3a6de2e714c61f8ae06ea459ab;hb=c04f88ca91b7612c70bcae9c8a70a98d5bd46c6e;hp=dfadf9a376464ae6f8cd836cda97bdd1684d2d68;hpb=d1232f5d7e1b74103fa84c2ba4fed91de0d80041;p=releng.git

diff --git a/jjb/functest/functest-alpine.sh b/jjb/functest/functest-alpine.sh
index dfadf9a37..c82147489 100755
--- a/jjb/functest/functest-alpine.sh
+++ b/jjb/functest/functest-alpine.sh
@@ -4,15 +4,16 @@ set -e
 set +u
 set +o pipefail
 
+REPO=${REPO:-opnfv}
 CI_LOOP=${CI_LOOP:-daily}
 TEST_DB_URL=http://testresults.opnfv.org/test/api/v1/results
 ENERGY_RECORDER_API_URL=http://energy.opnfv.fr/resources
 
 check_os_deployment() {
-    FUNCTEST_IMAGE=opnfv/functest-healthcheck:${DOCKER_TAG}
+    FUNCTEST_IMAGE=${REPO}/functest-healthcheck:${DOCKER_TAG}
     echo "Functest: Pulling Functest Docker image ${FUNCTEST_IMAGE} ..."
     docker pull ${FUNCTEST_IMAGE}>/dev/null
-    cmd="docker run --rm --privileged=true ${volumes} ${FUNCTEST_IMAGE} check_deployment"
+    cmd="docker run --rm ${volumes} ${FUNCTEST_IMAGE} check_deployment"
     echo "Checking deployment, CMD: ${cmd}"
     eval ${cmd}
     ret_value=$?
@@ -25,24 +26,15 @@ check_os_deployment() {
 
 }
 
-
 run_tiers() {
     tiers=$1
-    if [[ ${BRANCH##*/} == "master" ]]; then
-        cmd_opt="run_tests -r -t all"
-        [[ $BUILD_TAG =~ "suite" ]] && cmd_opt="run_tests -t all"
-    else
-        cmd_opt="prepare_env start && run_tests -r -t all"
-        [[ $BUILD_TAG =~ "suite" ]] && cmd_opt="prepare_env start && run_tests -t all"
-    fi
-    ret_val_file="${HOME}/opnfv/functest/results/${BRANCH##*/}/return_value"
-    echo 0 > ${ret_val_file}
-
+    cmd_opt="run_tests -r -t all"
+    [[ $BUILD_TAG =~ "suite" ]] && cmd_opt="run_tests -t all"
     for tier in ${tiers[@]}; do
-        FUNCTEST_IMAGE=opnfv/functest-${tier}:${DOCKER_TAG}
+        FUNCTEST_IMAGE=${REPO}/functest-${tier}:${DOCKER_TAG}
         echo "Functest: Pulling Functest Docker image ${FUNCTEST_IMAGE} ..."
         docker pull ${FUNCTEST_IMAGE}>/dev/null
-        cmd="docker run --rm  --privileged=true ${envs} ${volumes} ${TESTCASE_OPTIONS} ${FUNCTEST_IMAGE} /bin/bash -c '${cmd_opt}'"
+        cmd="docker run --rm  ${envs} ${volumes} ${TESTCASE_OPTIONS} ${FUNCTEST_IMAGE} /bin/bash -c '${cmd_opt}'"
         echo "Running Functest tier '${tier}'. CMD: ${cmd}"
         eval ${cmd}
         ret_value=$?
@@ -58,27 +50,21 @@ run_tiers() {
 
 run_test() {
     test_name=$1
-    if [[ ${BRANCH##*/} == "master" ]]; then
-        cmd_opt="run_tests -t ${test_name}"
-    else
-        cmd_opt="prepare_env start && run_tests -t ${test_name}"
-    fi
-    ret_val_file="${HOME}/opnfv/functest/results/${BRANCH##*/}/return_value"
-    echo 0 > ${ret_val_file}
+    cmd_opt="run_tests -t ${test_name}"
     # Determine which Functest image should be used for the test case
     case ${test_name} in
-        connection_check|api_check|snaps_health_check)
-            FUNCTEST_IMAGE=opnfv/functest-healthcheck:${DOCKER_TAG} ;;
-        vping_ssh|vping_userdata|tempest_smoke_serial|rally_sanity|refstack_defcore|odl|odl_netvirt|snaps_smoke)
-            FUNCTEST_IMAGE=opnfv/functest-smoke:${DOCKER_TAG} ;;
-        tempest_full_parallel|rally_full)
-            FUNCTEST_IMAGE=opnfv/functest-components:${DOCKER_TAG} ;;
-        cloudify_ims|orchestra_openims|orchestra_clearwaterims|vyos_vrouter)
-            FUNCTEST_IMAGE=opnfv/functest-vnf:${DOCKER_TAG} ;;
-        promise|doctor-notification|bgpvpn|functest-odl-sfc|domino-multinode|barometercollectd|fds)
-            FUNCTEST_IMAGE=opnfv/functest-features:${DOCKER_TAG} ;;
-        parser-basics)
-            FUNCTEST_IMAGE=opnfv/functest-parser:${DOCKER_TAG} ;;
+        connection_check|tenantnetwork1|tenantnetwork2|vmready1|vmready2|singlevm1|singlevm2|vping_ssh|vping_userdata|cinder_test|odl|api_check|snaps_health_check)
+            FUNCTEST_IMAGE=${REPO}/functest-healthcheck:${DOCKER_TAG} ;;
+        tempest_smoke_serial|tempest_smoke|neutron-tempest-plugin-api|rally_sanity|refstack_defcore|patrole|snaps_smoke|neutron_trunk|networking-bgpvpn|networking-sfc|barbican)
+            FUNCTEST_IMAGE=${REPO}/functest-smoke:${DOCKER_TAG} ;;
+        shaker|vmtp)
+            FUNCTEST_IMAGE=${REPO}/functest-benchmarking:${DOCKER_TAG} ;;
+        tempest_full_parallel|tempest_full|tempest_scenario|rally_full)
+            FUNCTEST_IMAGE=${REPO}/functest-components:${DOCKER_TAG} ;;
+        cloudify|cloudify_ims|heat_ims|vyos_vrouter|juju_epc)
+            FUNCTEST_IMAGE=${REPO}/functest-vnf:${DOCKER_TAG} ;;
+        doctor-notification|bgpvpn|functest-odl-sfc|barometercollectd|fds|vgpu|stor4nfv_os)
+            FUNCTEST_IMAGE=${REPO}/functest-features:${DOCKER_TAG} ;;
         *)
             echo "Unkown test case $test_name"
             exit 1
@@ -86,7 +72,7 @@ run_test() {
     esac
     echo "Functest: Pulling Functest Docker image ${FUNCTEST_IMAGE} ..."
     docker pull ${FUNCTEST_IMAGE}>/dev/null
-    cmd="docker run --rm --privileged=true ${envs} ${volumes} ${TESTCASE_OPTIONS} ${FUNCTEST_IMAGE} /bin/bash -c '${cmd_opt}'"
+    cmd="docker run --rm ${envs} ${volumes} ${TESTCASE_OPTIONS} ${FUNCTEST_IMAGE} /bin/bash -c '${cmd_opt}'"
     echo "Running Functest test case '${test_name}'. CMD: ${cmd}"
     eval ${cmd}
     ret_value=$?
@@ -115,16 +101,7 @@ elif [[ ${INSTALLER_TYPE} == 'fuel' && ${DEPLOY_TYPE} == 'baremetal' ]]; then
     cacert_file_vol="-v ${HOME}/os_cacert:/etc/ssl/certs/mcp_os_cacert"
 fi
 
-if [[ ${BRANCH} == "stable/euphrates" ]]; then
-    rc_file_vol="-v ${rc_file}:${FUNCTEST_DIR}/conf/openstack.creds"
-else
-    rc_file_vol="-v ${rc_file}:${FUNCTEST_DIR}/conf/env_file"
-fi
-
-# Set iptables rule to allow forwarding return traffic for container
-if ! sudo iptables -C FORWARD -j RETURN 2> ${redirect} || ! sudo iptables -L FORWARD | awk 'NR==3' | grep RETURN 2> ${redirect}; then
-    sudo iptables -I FORWARD -j RETURN
-fi
+rc_file_vol="-v ${rc_file}:${FUNCTEST_DIR}/conf/env_file"
 
 echo "Functest: Start Docker and prepare environment"
 
@@ -175,9 +152,11 @@ fi
 
 volumes="${images_vol} ${results_vol} ${sshkey_vol} ${userconfig_vol} ${rc_file_vol} ${cacert_file_vol}"
 
+ret_val_file="${HOME}/opnfv/functest/results/${BRANCH##*/}/return_value"
+echo 0 > ${ret_val_file}
+
 set +e
 
-[[ ${BRANCH##*/} == "master" ]] && check_os_deployment
 if [ ${FUNCTEST_MODE} == 'testcase' ]; then
     echo "FUNCTEST_MODE=testcase, FUNCTEST_SUITE_NAME=${FUNCTEST_SUITE_NAME}"
     run_test ${FUNCTEST_SUITE_NAME}
@@ -186,10 +165,24 @@ elif [ ${FUNCTEST_MODE} == 'tier' ]; then
     tiers=(${FUNCTEST_TIER})
     run_tiers ${tiers}
 else
-    if [ ${DEPLOY_TYPE} == 'baremetal' ]; then
-        tiers=(healthcheck smoke features vnf parser)
+    tests=(tempest_full tempest_scenario)
+    if [ ${DEPLOY_TYPE} == 'baremetal' ] && [ "${HOST_ARCH}" != "aarch64" ]; then
+        if [[ ${BRANCH} == "stable/fraser" ]]; then
+            tiers=(healthcheck smoke features vnf parser)
+            tests=(tempest_full_parallel)
+        else
+            tiers=(healthcheck smoke benchmarking features vnf)
+        fi
     else
-        tiers=(healthcheck smoke features)
+        if [[ ${BRANCH} == "stable/fraser" ]]; then
+            tiers=(healthcheck smoke features parser)
+            tests=(tempest_full_parallel)
+        else
+            tiers=(healthcheck smoke benchmarking features)
+        fi
     fi
     run_tiers ${tiers}
+    for test in "${tests[@]}"; do
+        run_test "$test"
+    done
 fi