diff options
| -rw-r--r-- | docker/Dockerfile | 4 | ||||
| -rw-r--r-- | testcases/VIM/OpenStack/CI/libraries/run_tempest.py | 2 | ||||
| -rwxr-xr-x | testcases/config_functest.py | 13 | ||||
| -rw-r--r-- | testcases/config_functest.yaml | 3 |
4 files changed, 10 insertions, 12 deletions
diff --git a/docker/Dockerfile b/docker/Dockerfile index 6188deae..3a39c4c5 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -68,6 +68,7 @@ RUN git clone -b stable/brahmaputra https://gerrit.opnfv.org/gerrit/functest ${r 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/openstack/tempest.git ${repos_dir}/tempest 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 @@ -77,6 +78,9 @@ 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 +RUN pip install -r ${repos_dir}/tempest/pip install -r requirements.txt + +RUN ${repos_dir}/rally/install_rally.sh --yes ADD http://download.cirros-cloud.net/0.3.4/cirros-0.3.4-x86_64-disk.img /home/opnfv/functest/data/ diff --git a/testcases/VIM/OpenStack/CI/libraries/run_tempest.py b/testcases/VIM/OpenStack/CI/libraries/run_tempest.py index 660e21bc..04d8e86b 100644 --- a/testcases/VIM/OpenStack/CI/libraries/run_tempest.py +++ b/testcases/VIM/OpenStack/CI/libraries/run_tempest.py @@ -228,7 +228,7 @@ def run_tempest(OPTION): # :return: void # logger.info("Starting Tempest test suite: '%s'." % OPTION) - cmd_line = "rally verify start "+OPTION + cmd_line = "rally verify start " + OPTION + " --system-wide" logger.debug('Executing command : {}'.format(cmd_line)) CI_DEBUG = os.environ.get("CI_DEBUG") diff --git a/testcases/config_functest.py b/testcases/config_functest.py index 21c569cb..fa58a563 100755 --- a/testcases/config_functest.py +++ b/testcases/config_functest.py @@ -55,6 +55,7 @@ RALLY_DIR = FUNCTEST_REPO + functest_yaml.get("general").get("directories").get( RALLY_REPO_DIR = functest_yaml.get("general").get("directories").get("dir_repo_rally") RALLY_INSTALLATION_DIR = functest_yaml.get("general").get("directories").get("dir_rally_inst") RALLY_RESULT_DIR = functest_yaml.get("general").get("directories").get("dir_rally_res") +TEMPEST_REPO_DIR = functest_yaml.get("general").get("directories").get("dir_repo_tempest") VPING_DIR = FUNCTEST_REPO + functest_yaml.get("general").get("directories").get("dir_vping") VIMS_TEST_DIR = functest_yaml.get("general").get("directories").get("dir_repo_vims_test") ODL_DIR = FUNCTEST_REPO + functest_yaml.get("general").get("directories").get("dir_odl") @@ -209,20 +210,12 @@ def install_rally(): if check_rally(): logger.info("Rally is already installed.") else: - logger.debug("Executing %s/install_rally.sh..." %RALLY_REPO_DIR) - install_script = RALLY_REPO_DIR + "/install_rally.sh --yes" - cmd = 'sudo ' + install_script - if os.environ.get("CI_DEBUG") == "false": - functest_utils.execute_command(cmd) - else: - functest_utils.execute_command(cmd,logger) - logger.debug("Creating Rally environment...") cmd = "rally deployment create --fromenv --name="+DEPLOYMENT_MAME functest_utils.execute_command(cmd,logger) - logger.debug("Installing tempest...") - cmd = "rally verify install" + logger.debug("Installing tempest from existing repo...") + cmd = "rally verify install --source " + TEMPEST_REPO_DIR + " --system-wide" functest_utils.execute_command(cmd,logger) cmd = "rally deployment check" diff --git a/testcases/config_functest.yaml b/testcases/config_functest.yaml index 5f7daee1..5fe6a23e 100644 --- a/testcases/config_functest.yaml +++ b/testcases/config_functest.yaml @@ -12,6 +12,7 @@ general: dir_repos: /home/opnfv/repos dir_repo_functest: /home/opnfv/repos/functest dir_repo_rally: /home/opnfv/repos/rally + dir_repo_tempest: /home/opnfv/repos/tempest dir_repo_releng: /home/opnfv/repos/releng dir_repo_vims_test: /home/opnfv/repos/vims-test dir_repo_bgpvpn: /home/opnfv/repos/bgpvpn @@ -32,7 +33,7 @@ general: releng_branch: master releng_commit: latest rally_branch: master - rally_commit: 57efc5327530a34d139b5a1fd1f480195de0aadb + rally_commit: 1b6e9e9219b143c685a2af134ab025dddd72ed27 vims_test_branch: stable vims_test_commit: latest bgpvpn_branch: master |