aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorboucherv <valentin.boucher@orange.com>2016-01-15 10:13:44 +0100
committerMorgan Richomme <morgan.richomme@orange.com>2016-01-15 09:51:38 +0000
commit56bafb321398dd1d5ab65bd6cd92a495ec8aeb23 (patch)
treee6696821f9c368904bc8d7fa798770476c53f7bc
parentb241534d5a37ac93368aec79727238e3aed75d43 (diff)
Fix bug ruby sig test
Change-Id: Ieb908e7af2365381ad576a3da9a0787f96c9efe2 Signed-off-by: boucherv <valentin.boucher@orange.com> (cherry picked from commit dee9be014293503645069ff6796f5231b3f7ae48)
-rw-r--r--docker/Dockerfile1
-rwxr-xr-xtestcases/config_functest.py5
2 files changed, 4 insertions, 2 deletions
diff --git a/docker/Dockerfile b/docker/Dockerfile
index 4a2d87bf6..69c2bd48f 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -74,4 +74,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'
diff --git a/testcases/config_functest.py b/testcases/config_functest.py
index 19d894fb7..c2e8737b7 100755
--- a/testcases/config_functest.py
+++ b/testcases/config_functest.py
@@ -115,10 +115,13 @@ def action_start():
action_clean()
exit(-1)
+ logger.info("Installing Ruby libraries for vIMS testcase...")
# Install ruby libraries for vims test-case
script = 'source /etc/profile.d/rvm.sh; '
script += 'cd ' + VIMS_TEST_DIR + '; '
- script += 'rvm use system;'
+ script += 'rvm autolibs enable ;'
+ script += 'rvm install 1.9.3; '
+ script += 'rvm use 1.9.3;'
script += 'bundle install'
cmd = "/bin/bash -c '" + script + "'"