diff options
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/Dockerfile | 8 | ||||
| -rwxr-xr-x | docker/prepare_env.sh | 9 | ||||
| -rwxr-xr-x | docker/run_tests.sh | 18 |
3 files changed, 18 insertions, 17 deletions
diff --git a/docker/Dockerfile b/docker/Dockerfile index 99d18cade..decce6812 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -48,6 +48,7 @@ libgmp3-dev \ libxml2-dev \ libffi-dev \ crudini \ +ruby1.9.1-dev \ --no-install-recommends @@ -64,10 +65,11 @@ 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 pip install -r ${repos_dir}/functest/docker/requirements.pip +RUN pip install -r ${repos_dir}/rally/requirements.txt + +ADD http://download.cirros-cloud.net/0.3.4/cirros-0.3.4-x86_64-disk.img /home/opnfv/functest/data/ RUN gpg --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3 RUN curl -L https://get.rvm.io | bash -s stable RUN bash -c 'source /etc/profile.d/rvm.sh ; rvm autolibs enable ; rvm install 1.9.3 ; rvm use 1.9.3' -RUN bash -c 'source /etc/profile.d/rvm.sh ; cd ${repos_dir}/vims-test ; bundle install' - -ADD http://download.cirros-cloud.net/0.3.4/cirros-0.3.4-x86_64-disk.img /home/opnfv/functest/data/
\ No newline at end of file +RUN bash -c 'source /etc/profile.d/rvm.sh ; cd ${repos_dir}/vims-test;rvm use system;bundle install' diff --git a/docker/prepare_env.sh b/docker/prepare_env.sh index 0c618bff8..983eefc08 100755 --- a/docker/prepare_env.sh +++ b/docker/prepare_env.sh @@ -188,10 +188,17 @@ fi # Source credentials source ${FUNCTEST_CONF_DIR}/openstack.creds +# Check OpenStack +info "Checking that the basic OpenStack services are functional..." +${FUNCTEST_REPO_DIR}/testcases/VIM/OpenStack/CI/libraries/check_os.sh +RETVAL=$? +if [ $RETVAL -ne 0 ]; then + exit 1 +fi # Prepare Functest Environment info "Functest: prepare Functest environment" -python ${FUNCTEST_REPO_DIR}/testcases/config_functest.py --debug ${FUNCTEST_REPO_DIR}/ start +python ${FUNCTEST_REPO_DIR}/testcases/config_functest.py --debug start retval=$? if [ $retval != 0 ]; then error "Error when configuring Functest environment" diff --git a/docker/run_tests.sh b/docker/run_tests.sh index 00d534871..898cc4ca0 100755 --- a/docker/run_tests.sh +++ b/docker/run_tests.sh @@ -34,7 +34,7 @@ arr_test=(vping odl tempest vims rally) function clean_openstack(){ python ${FUNCTEST_REPO_DIR}/testcases/VIM/OpenStack/CI/libraries/clean_openstack.py \ - --debug ${FUNCTEST_REPO_DIR}/ + --debug } function run_test(){ @@ -46,7 +46,7 @@ function run_test(){ "vping") info "Running vPing test..." python ${FUNCTEST_REPO_DIR}/testcases/vPing/CI/libraries/vPing.py \ - --debug ${FUNCTEST_REPO_DIR}/ ${report} + --debug ${report} ;; "odl") info "Running ODL test..." @@ -79,7 +79,7 @@ function run_test(){ "tempest") info "Running Tempest smoke tests..." python ${FUNCTEST_REPO_DIR}/testcases/VIM/OpenStack/CI/libraries/run_tempest.py \ - --debug ${FUNCTEST_REPO_DIR}/ -m smoke ${report} + --debug -m smoke ${report} # save tempest.conf for further troubleshooting tempest_conf="${RALLY_VENV_DIR}/tempest/for-deployment-*/tempest.conf" if [ -f ${tempest_conf} ]; then @@ -90,13 +90,13 @@ function run_test(){ "vims") info "Running vIMS test..." python ${FUNCTEST_REPO_DIR}/testcases/vIMS/CI/vIMS.py \ - --debug ${FUNCTEST_REPO_DIR}/ ${report} + --debug ${report} clean_openstack ;; "rally") info "Running Rally benchmark suite..." python ${FUNCTEST_REPO_DIR}/testcases/VIM/OpenStack/CI/libraries/run_rally.py \ - --debug ${FUNCTEST_REPO_DIR}/ all ${report} + --debug all ${report} clean_openstack ;; "bgpvpn_template") @@ -175,14 +175,6 @@ fi info "Sourcing Credentials ${FUNCTEST_CONF_DIR}/openstack.creds to run the tests.." source ${FUNCTEST_CONF_DIR}/openstack.creds -# Check OpenStack -info "Checking that the basic OpenStack services are functional..." -${FUNCTEST_REPO_DIR}/testcases/VIM/OpenStack/CI/libraries/check_os.sh -RETVAL=$? -if [ $RETVAL -ne 0 ]; then - exit 1 -fi - # Run tests if [ "${TEST}" != "" ]; then for i in "${arr_test_exec[@]}"; do |