diff options
| -rw-r--r-- | docker/Dockerfile | 2 | ||||
| -rwxr-xr-x | docker/common.sh | 4 | ||||
| -rwxr-xr-x | docker/prepare_env.sh | 13 | ||||
| -rw-r--r-- | docker/requirements.pip | 2 | ||||
| -rwxr-xr-x | docker/run_tests.sh | 8 | ||||
| -rw-r--r-- | testcases/config_functest.yaml | 5 |
6 files changed, 31 insertions, 3 deletions
diff --git a/docker/Dockerfile b/docker/Dockerfile index 1389aaebf..6ae06e235 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -59,11 +59,13 @@ RUN chmod 700 /root/.ssh RUN git config --global http.sslVerify false RUN git clone https://gerrit.opnfv.org/gerrit/functest ${repos_dir}/functest RUN git clone https://gerrit.opnfv.org/gerrit/releng ${repos_dir}/releng +RUN git clone https://gerrit.opnfv.org/gerrit/doctor ${repos_dir}/doctor RUN git clone https://github.com/openstack/rally.git ${repos_dir}/rally RUN git clone https://github.com/opendaylight/integration.git ${repos_dir}/odl_integration RUN git clone -b stable https://github.com/boucherv-orange/clearwater-live-test ${repos_dir}/vims-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 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 4ea0907a4..aabc32cbe 100755 --- a/docker/common.sh +++ b/docker/common.sh @@ -55,6 +55,8 @@ BGPVPN_BRANCH=$(cat $config_file | grep -w bgpvpn_branch | awk 'END {print $NF}' BGPVPN_COMMIT=$(cat $config_file | grep -w bgpvpn_commit | awk 'END {print $NF}') 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}') echo "_____Parsed needed data from ${config_file}:" @@ -80,6 +82,8 @@ echo "VIMS_BRANCH=${VIMS_BRANCH}" echo "VIMS_COMMIT=${VIMS_COMMIT}" echo "ONOS_BRANCH=${ONOS_BRANCH}" echo "ONOS_COMMIT=${ONOS_COMMIT}" +echo "PROMISE_BRANCH=${PROMISE_BRANCH}" +echo "PROMISE_COMMIT=${PROMISE_COMMIT}" echo "############################" info () { diff --git a/docker/prepare_env.sh b/docker/prepare_env.sh index cae53b7c0..321ae9fe3 100755 --- a/docker/prepare_env.sh +++ b/docker/prepare_env.sh @@ -156,6 +156,19 @@ if [ $offline == false ]; then git reset --hard ${ONOS_COMMIT} fi + info "Updating PROMISE repository...." + cd ${PROMISE_REPO_DIR} + if [ ${PROMISE_BRANCH} != "master" ]; then + info "PROMISE repo: checkout ${PROMISE} branch..." + git checkout ${PROMISE_BRANCH} + fi + info "PROMISE repo: pulling to latest..." + git pull + if [ ${PROMISE_COMMIT} != "latest" ]; then + info "PROMISE repo: given commit is ${PROMISE_COMMIT}. Reseting..." + git reset --hard ${PROMISE_COMMIT} + fi + fi # We do this regardless if its online or offline mode. diff --git a/docker/requirements.pip b/docker/requirements.pip index f8c888a82..8644154cf 100644 --- a/docker/requirements.pip +++ b/docker/requirements.pip @@ -4,6 +4,7 @@ python-neutronclient==2.6.0 python-novaclient==2.28.1 python-glanceclient==1.1.0 python-cinderclient==1.4.0 +python-ceilometerclient==1.5.1 python-keystoneclient==1.6.0 virtualenv==1.11.4 pexpect==4.0 @@ -12,3 +13,4 @@ robotframework==2.9.1 robotframework-requests==0.3.8 robotframework-sshlibrary==2.1.1 configObj==5.0.6 +Flask==0.10.1 diff --git a/docker/run_tests.sh b/docker/run_tests.sh index dcaaeb9bb..257fab1d9 100755 --- a/docker/run_tests.sh +++ b/docker/run_tests.sh @@ -17,7 +17,7 @@ where: -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. Separated by comma. + <test_name> one or more of the following: vping,odl,rally,tempest,vims,onos, promise. Separated by comma. examples: @@ -115,7 +115,11 @@ function run_test(){ "onos") info "Running ONOS test case..." python ${FUNCTEST_REPO_DIR}/testcases/Controllers/ONOS/Teston/CI/onosfunctest.py - esac + ;; + "promise") + info "Running PROMISE test case..." + # TODO + esac } diff --git a/testcases/config_functest.yaml b/testcases/config_functest.yaml index bc41350e1..bca4f9dcd 100644 --- a/testcases/config_functest.yaml +++ b/testcases/config_functest.yaml @@ -16,6 +16,7 @@ general: dir_repo_vims_test: /home/opnfv/repos/vims-test dir_repo_bgpvpn: /home/opnfv/repos/bgpvpn dir_repo_onos: /home/opnfv/repos/onos + dir_repo_promise: /home/opnfv/repos/promise dir_functest: /home/opnfv/functest dir_results: /home/opnfv/functest/results dir_functest_conf: /home/opnfv/functest/conf @@ -31,13 +32,15 @@ general: releng_branch: master releng_commit: latest rally_branch: master - rally_commit: 2c34d1896a7a9f2955a2a09531a9c3eb3f88517b + rally_commit: 57efc5327530a34d139b5a1fd1f480195de0aadb vims_test_branch: stable vims_test_commit: latest bgpvpn_branch: master bgpvpn_commit: latest onos_branch: master onos_commit: latest + promise_branch: master + promise_commit: latest openstack: image_name: functest-img |