aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--docker/Dockerfile1
-rwxr-xr-xtestcases/config_functest.py1
-rw-r--r--testcases/vIMS/CI/vIMS.py2
3 files changed, 2 insertions, 2 deletions
diff --git a/docker/Dockerfile b/docker/Dockerfile
index 0d2cfb4f..4a2d87bf 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -75,4 +75,3 @@ ADD http://download.cirros-cloud.net/0.3.4/cirros-0.3.4-x86_64-disk.img /home/op
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;rvm use system;bundle install'
diff --git a/testcases/config_functest.py b/testcases/config_functest.py
index 8ae0d163..d392d557 100755
--- a/testcases/config_functest.py
+++ b/testcases/config_functest.py
@@ -118,6 +118,7 @@ def action_start():
# Install ruby libraries for vims test-case
script = 'source /etc/profile.d/rvm.sh; '
script += 'cd ' + VIMS_TEST_DIR + '; '
+ script += 'rvm use system;'
script += 'bundle install'
cmd = "/bin/bash -c '" + script + "'"
diff --git a/testcases/vIMS/CI/vIMS.py b/testcases/vIMS/CI/vIMS.py
index d2b6567d..7a2d1979 100644
--- a/testcases/vIMS/CI/vIMS.py
+++ b/testcases/vIMS/CI/vIMS.py
@@ -179,7 +179,7 @@ def test_clearwater():
logger.debug("Pushing results to DB....")
git_version = functest_utils.get_git_branch(REPO_PATH)
functest_utils.push_results_to_db(db_url=TEST_DB, case_name="vIMS",
- logger=logger, pod_name="opnfv-jump-2", git_version=git_version,
+ logger=logger, pod_name=functest_utils.get_pod_name(logger), git_version=git_version,
payload={'orchestrator': {'duration': CFY_DEPLOYMENT_DURATION,
'result': ""},
'vIMS': {'duration': CW_DEPLOYMENT_DURATION,