diff options
| -rw-r--r-- | docker/Dockerfile | 1 | ||||
| -rwxr-xr-x | docker/common.sh | 4 | ||||
| -rwxr-xr-x | docker/run_tests.sh | 33 | ||||
| -rwxr-xr-x | testcases/VIM/OpenStack/CI/libraries/check_os.sh | 6 | ||||
| -rw-r--r-- | testcases/config_functest.yaml | 5 |
5 files changed, 33 insertions, 16 deletions
diff --git a/docker/Dockerfile b/docker/Dockerfile index 69c2bd48f..0765eb848 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -66,6 +66,7 @@ RUN git clone -b stable https://github.com/boucherv-orange/clearwater-live-test RUN git clone https://github.com/openstack/networking-bgpvpn ${repos_dir}/bgpvpn RUN git clone https://gerrit.onosproject.org/OnosSystemTest ${repos_dir}/onos RUN git clone https://github.com/opnfv/promise ${repos_dir}/promise +RUN git clone https://gerrit.opnfv.org/gerrit/ovno ${repos_dir}/ovno RUN pip install -r ${repos_dir}/functest/docker/requirements.pip RUN pip install -r ${repos_dir}/rally/requirements.txt diff --git a/docker/common.sh b/docker/common.sh index d61e9576c..1f1cc75df 100755 --- a/docker/common.sh +++ b/docker/common.sh @@ -65,6 +65,8 @@ ONOS_BRANCH=$(cat $config_file | grep -w onos_branch | awk 'END {print $NF}') ONOS_COMMIT=$(cat $config_file | grep -w onos_commit | awk 'END {print $NF}') PROMISE_BRANCH=$(cat $config_file | grep -w promise_branch | awk 'END {print $NF}') PROMISE_COMMIT=$(cat $config_file | grep -w promise_commit | awk 'END {print $NF}') +OVNO_BRANCH=$(cat $config_file | grep -w ovno_branch | awk 'END {print $NF}') +OVNO_COMMIT=$(cat $config_file | grep -w ovno_commit | awk 'END {print $NF}') echo "_____Parsed needed data from ${config_file}:" @@ -90,6 +92,8 @@ echo "ONOS_BRANCH=${ONOS_BRANCH}" echo "ONOS_COMMIT=${ONOS_COMMIT}" echo "PROMISE_BRANCH=${PROMISE_BRANCH}" echo "PROMISE_COMMIT=${PROMISE_COMMIT}" +echo "OVNO_BRANCH=${OVNO_BRANCH}" +echo "OVNO_COMMIT=${OVNO_COMMIT}" echo "############################" info () { diff --git a/docker/run_tests.sh b/docker/run_tests.sh index 97bbfefec..cb6fb0c80 100755 --- a/docker/run_tests.sh +++ b/docker/run_tests.sh @@ -10,20 +10,19 @@ usage="Script to trigger the tests automatically. usage: - bash $(basename "$0") [--offline] [-h|--help] [-t <test_name>] + bash $(basename "$0") [-h|--help] [-t <test_name>] where: - -o|--offline optional offline mode (experimental) -h|--help show this help text -r|--report push results to database (false by default) -t|--test run specific set of tests - <test_name> one or more of the following: vping,odl,rally,tempest,vims,onos, promise. Separated by comma. + <test_name> one or more of the following: vping,odl,rally,tempest,vims,onos,promise,ovno. Separated by comma. examples: $(basename "$0") $(basename "$0") --test vping,odl - $(basename "$0") --offline -t tempest,rally" + $(basename "$0") -t tempest,rally" # Support for Functest offline @@ -32,12 +31,7 @@ offline=false report="" # Get the list of runnable tests # Check if we are in CI mode -if [[ -n "$DEPLOY_SCENARIO" && "$DEPLOY_SCENARIO" != "none" ]]; then - testcase=`cat /home/opnfv/functest/conf/testcase-list.txt` - arr_test=("$testcase") -else - arr_test=(vping tempest vims rally) -fi + function clean_openstack(){ echo -e "\n\nCleaning Openstack environment..." @@ -50,7 +44,7 @@ function run_test(){ test_name=$1 echo "" echo "----------------------------------------------" - echo " Running test case: $i" + echo " Running test cases: $i" echo "----------------------------------------------" echo "" case $test_name in @@ -138,6 +132,10 @@ function run_test(){ info "Running Doctor test..." python ${FUNCTEST_REPO_DIR}/testcases/features/doctor.py ;; + "ovno") + info "Running OpenContrail test..." + # TODO + ;; esac } @@ -170,6 +168,17 @@ while [[ $# > 0 ]] shift # past argument or value done + +tests_file="/home/opnfv/functest/conf/testcase-list.txt" +if [[ -n "$DEPLOY_SCENARIO" && "$DEPLOY_SCENARIO" != "none" ]] &&\ + [[ -f $tests_file ]]; then + echo "testcase-list.txt content:";cat $test_file; echo "" + arr_test=($(cat $tests_file)) +else + arr_test=(vping tempest vims rally) +fi +echo "arr_test: "${arr_test[@]} + BASEDIR=`dirname $0` source ${BASEDIR}/common.sh @@ -208,7 +217,7 @@ if [ "${TEST}" != "" ]; then run_test $i done else - info "Executing all the tests" + info "Executing tests..." for i in "${arr_test[@]}"; do run_test $i done diff --git a/testcases/VIM/OpenStack/CI/libraries/check_os.sh b/testcases/VIM/OpenStack/CI/libraries/check_os.sh index 1327eff5f..63d4ea696 100755 --- a/testcases/VIM/OpenStack/CI/libraries/check_os.sh +++ b/testcases/VIM/OpenStack/CI/libraries/check_os.sh @@ -31,7 +31,7 @@ echo ">>Verifying connectivity to the public endpoint $publicIP:$publicPort..." verify_connectivity $publicIP $publicPort RETVAL=$? if [ $RETVAL -ne 0 ]; then - echo "ERROR: Cannot talk to the public endpoint publicIP:$publicPort ." + echo "ERROR: Cannot talk to the public endpoint $publicIP:$publicPort ." echo "OS_AUTH_URL=$OS_AUTH_URL" exit 1 fi @@ -44,8 +44,8 @@ echo ">>Verifying connectivity to the admin endpoint $adminIP:$adminPort..." verify_connectivity $adminIP $adminPort RETVAL=$? if [ $RETVAL -ne 0 ]; then - echo "ERROR: Cannot talk to the admin endpoint adminIP:$adminPort ." - echo "adminURL" + echo "ERROR: Cannot talk to the admin endpoint $adminIP:$adminPort ." + echo "$adminURL" exit 1 fi echo " ...OK" diff --git a/testcases/config_functest.yaml b/testcases/config_functest.yaml index 7c1e79d36..6a612067b 100644 --- a/testcases/config_functest.yaml +++ b/testcases/config_functest.yaml @@ -18,6 +18,7 @@ general: dir_repo_onos: /home/opnfv/repos/onos dir_repo_promise: /home/opnfv/repos/promise dir_repo_doctor: /home/opnfv/repos/doctor + dir_repo_ovno: /home/opnfv/repos/ovno dir_functest: /home/opnfv/functest dir_results: /home/opnfv/functest/results dir_functest_conf: /home/opnfv/functest/conf @@ -40,6 +41,8 @@ general: onos_commit: latest promise_branch: master promise_commit: latest + ovno_branch: master + ovno_commit: latest openstack: image_name: functest-img @@ -158,7 +161,7 @@ test_exec_priority: 2: tempest 3: odl 4: onos - #5: ovno + 5: ovno #6: doctor 7: promise #8: policy-test |