aboutsummaryrefslogtreecommitdiffstats
path: root/testcases/Controllers
diff options
context:
space:
mode:
authorMorgan Richomme <morgan.richomme@orange.com>2015-10-19 12:43:06 +0000
committerGerrit Code Review <gerrit@172.30.200.206>2015-10-19 12:43:06 +0000
commit1f1d790fa6856ef484e0e77a93b71aaea0750942 (patch)
tree81f6b79215485c28a9f273bbb0189f8fc0e16fea /testcases/Controllers
parent815b5495758239fed1a9a4d2750c0bb83088c7e6 (diff)
parentc347879b5e3ecf85c82cb724efd6596406a269d5 (diff)
Merge "ODL test suite requirements.pip moved to general requirements"
Diffstat (limited to 'testcases/Controllers')
-rwxr-xr-xtestcases/Controllers/ODL/CI/create_venv.sh35
-rw-r--r--testcases/Controllers/ODL/CI/requirements.pip4
-rwxr-xr-xtestcases/Controllers/ODL/CI/start_tests.sh12
3 files changed, 0 insertions, 51 deletions
diff --git a/testcases/Controllers/ODL/CI/create_venv.sh b/testcases/Controllers/ODL/CI/create_venv.sh
deleted file mode 100755
index 19d9b49c4..000000000
--- a/testcases/Controllers/ODL/CI/create_venv.sh
+++ /dev/null
@@ -1,35 +0,0 @@
-#!/bin/bash -e
-
-# Script checks that venv exists. If it doesn't it will be created
-# It requires python2.7 and virtualenv packages installed
-
-BASEDIR=`dirname $0`
-
-function venv_install() {
- if command -v virtualenv-2.7; then
- virtualenv-2.7 $1
- elif command -v virtualenv2; then
- virtualenv2 $1
- elif command -v virtualenv; then
- virtualenv $1
- else
- echo Cannot find virtualenv command.
- return 1
- fi
-}
-
-# exit when something goes wrong during venv install
-set -e
-if [ ! -d "$BASEDIR/venv" ]; then
- venv_install $BASEDIR/venv
- echo "Virtualenv created."
-fi
-
-if [ ! -f "$BASEDIR/venv/updated" -o $BASEDIR/requirements.pip -nt $BASEDIR/venv/updated ]; then
- source $BASEDIR/venv/bin/activate
- pip install -r $BASEDIR/requirements.pip
- touch $BASEDIR/venv/updated
- echo "Requirements installed."
- deactivate
-fi
-set +e
diff --git a/testcases/Controllers/ODL/CI/requirements.pip b/testcases/Controllers/ODL/CI/requirements.pip
deleted file mode 100644
index 43845e251..000000000
--- a/testcases/Controllers/ODL/CI/requirements.pip
+++ /dev/null
@@ -1,4 +0,0 @@
-requests
-robotframework
-robotframework-requests
-robotframework-sshlibrary
diff --git a/testcases/Controllers/ODL/CI/start_tests.sh b/testcases/Controllers/ODL/CI/start_tests.sh
index 56f4d564d..0b1c4a7f7 100755
--- a/testcases/Controllers/ODL/CI/start_tests.sh
+++ b/testcases/Controllers/ODL/CI/start_tests.sh
@@ -1,7 +1,5 @@
#!/bin/bash
-# Script requires that test environment is created already
# it includes python2.7 virtual env with robot packages and git
-# use create_env.sh script for creating python virtualenv
BASEDIR=`dirname $0`
# Colors
@@ -62,12 +60,6 @@ sed -i "s/\"password\": \".*\"/\"password\": \"${PASS}\"/" ${BASEDIR}/integratio
sed -i "/^Documentation.*/a Suite Teardown Stop Suite" ${BASEDIR}/integration/test/csit/suites/openstack/neutron/__init__.robot
sed -i "/^Documentation.*/a Suite Setup Start Suite" ${BASEDIR}/integration/test/csit/suites/openstack/neutron/__init__.robot
-if source $BASEDIR/venv/bin/activate; then
- echo -e "${green}Python virtualenv activated.${nc}"
-else
- echo -e "${red}ERROR${nc}"
- exit 1
-fi
# add custom tests to suite, if there are more custom tests needed this will be reworked
echo -e "${green}Copy custom tests to suite.${nc}"
@@ -100,7 +92,3 @@ done
echo -e "${green}Final report is located:${nc}"
rebot $rebot_params
-
-# deactivate venv
-echo -e "${green}Deactivate venv.${nc}"
-deactivate