diff options
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/Dockerfile | 3 | ||||
| -rwxr-xr-x | docker/common.sh | 8 | ||||
| -rwxr-xr-x | docker/prepare_env.sh | 27 | ||||
| -rw-r--r-- | docker/requirements.pip | 5 | ||||
| -rwxr-xr-x | docker/run_tests.sh | 12 |
5 files changed, 52 insertions, 3 deletions
diff --git a/docker/Dockerfile b/docker/Dockerfile index decce6812..6ae06e235 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -59,10 +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 82a4719a1..aabc32cbe 100755 --- a/docker/common.sh +++ b/docker/common.sh @@ -53,6 +53,10 @@ VIMS_BRANCH=$(cat $config_file | grep -w vims_test_branch | awk 'END {print $NF} VIMS_COMMIT=$(cat $config_file | grep -w vims_test_commit | awk 'END {print $NF}') 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}:" @@ -76,6 +80,10 @@ echo "RALLY_BRANCH=${RALLY_BRANCH}" echo "RALLY_COMMIT=${RALLY_COMMIT}" 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 983eefc08..321ae9fe3 100755 --- a/docker/prepare_env.sh +++ b/docker/prepare_env.sh @@ -142,6 +142,33 @@ if [ $offline == false ]; then info "BGPVPN repo: given commit is ${BGPVPN_COMMIT}. Reseting..." git reset --hard ${BGPVPN_COMMIT} fi + + info "Updating ONOS repository...." + cd ${ONOS_REPO_DIR} + if [ ${ONOS_BRANCH} != "master" ]; then + info "ONOS repo: checkout ${ONOS} branch..." + git checkout ${ONOS_BRANCH} + fi + info "ONOS repo: pulling to latest..." + git pull + if [ ${ONOS_COMMIT} != "latest" ]; then + info "ONOS repo: given commit is ${ONOS_COMMIT}. Reseting..." + 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 03036a828..8644154cf 100644 --- a/docker/requirements.pip +++ b/docker/requirements.pip @@ -4,10 +4,13 @@ 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 requests==2.8.0 robotframework==2.9.1 robotframework-requests==0.3.8 -robotframework-sshlibrary==2.1.1
\ No newline at end of file +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 28830e845..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. Separated by comma. + <test_name> one or more of the following: vping,odl,rally,tempest,vims,onos, promise. Separated by comma. examples: @@ -111,7 +111,15 @@ function run_test(){ # cp ${BGPVPN_REPO_DIR}/networking_bgpvpn_tempest/<whatever you need> \ # ${tempest_dir}/tempest/api/bgpvpn/ # ${tempest_dir}/run_tempest.sh tempest.api.bgpvpn.<test_case_name> - esac + ;; + "onos") + info "Running ONOS test case..." + python ${FUNCTEST_REPO_DIR}/testcases/Controllers/ONOS/Teston/CI/onosfunctest.py + ;; + "promise") + info "Running PROMISE test case..." + # TODO + esac } |