aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinda Wang <wangwulin@huawei.com>2017-03-16 08:51:55 +0000
committerJose Lausuch <jose.lausuch@ericsson.com>2017-03-23 11:06:11 +0000
commit391759749df039d239082f67f435367cf77d79d1 (patch)
tree4d37521b1c66def636409e0dbfc3d09a141b82b6
parentaacd330b2d24be6c88d23e69bf79f20cdd340af5 (diff)
Enable functest offline by installing tempest system wide
JIRA: FUNCTEST-764 1. When creating verifier via rally in functest env prepare, without the parameter "--system-wide", rally will install tempest and its dependent packages into the virtual env of rally. Thus, it needs to connect internet when installing tempest, which will not enable functest offline. 2. Some packages are needed for multisite testcase, and they are installed in virtual env of rally before. But if "--system-wide" is set, there packages should be installed addtionally. Change-Id: I340701e9ed4a0f8f278ff952f0dd61470c6deed1 Signed-off-by: Linda Wang <wangwulin@huawei.com> (cherry picked from commit 264896f475e3f0975754c9fa78980051661698c0)
-rw-r--r--docker/Dockerfile1
-rwxr-xr-xfunctest/ci/prepare_env.py2
-rw-r--r--kingbird_requirements.txt15
3 files changed, 17 insertions, 1 deletions
diff --git a/docker/Dockerfile b/docker/Dockerfile
index 30c31dad3..134b8ef3c 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -144,6 +144,7 @@ RUN cd ${REPOS_DIR}/bgpvpn && pip install -e .
# Kingbird integration
RUN cd ${REPOS_DIR}/kingbird && pip install -e .
+RUN cd ${FUNCTEST_REPO_DIR} && pip install -r kingbird_requirements.txt
# refstack-client integration
RUN cd ${REPOS_DIR}/refstack-client && ./setup_env -t ${REFSTACK_TAG}
diff --git a/functest/ci/prepare_env.py b/functest/ci/prepare_env.py
index 724ea14df..e9a470f9c 100755
--- a/functest/ci/prepare_env.py
+++ b/functest/ci/prepare_env.py
@@ -312,7 +312,7 @@ def install_tempest():
logger.debug("Tempest %s does not exist" %
CONST.tempest_deployment_name)
cmd = ("rally verify create-verifier --source {0} "
- "--name {1} --type tempest"
+ "--name {1} --type tempest --system-wide"
.format(CONST.dir_repo_tempest,
CONST.tempest_deployment_name))
error_msg = "Problem while installing Tempest."
diff --git a/kingbird_requirements.txt b/kingbird_requirements.txt
new file mode 100644
index 000000000..adf1082cb
--- /dev/null
+++ b/kingbird_requirements.txt
@@ -0,0 +1,15 @@
+#
+#
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Apache License, Version 2.0
+# which accompanies this distribution, and is available at
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+ddt==1.1.1
+oslosphinx==4.11.0
+oslotest==2.14.0
+pylint==1.4.5
+requests-mock==1.3.0
+tempest-lib==1.0.0
+testresources==2.0.1
+testscenarios==0.5.0