aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCédric Ollivier <cedric.ollivier@orange.com>2018-05-30 15:18:35 +0200
committerCédric Ollivier <cedric.ollivier@orange.com>2018-05-30 15:20:26 +0200
commit8b81b33530a9e46e7e6e7f8b81e752892bf9f2b9 (patch)
tree90971bc9439a74c2cd112cd3c0ab61c11f068119
parent30e4106b56608595885e1b46ad4b668866ab9426 (diff)
Bypass Cloudify's upper-constraints issues
It installs cmd2 via yum instead as last cmd2 release only supports python3. Change-Id: I495d71f11ed48ba47e1aa27965675d4bef7c141e Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
-rw-r--r--functest/opnfv_tests/vnf/ims/cloudify_ims.py3
-rw-r--r--functest/opnfv_tests/vnf/router/cloudify_vrouter.py3
2 files changed, 4 insertions, 2 deletions
diff --git a/functest/opnfv_tests/vnf/ims/cloudify_ims.py b/functest/opnfv_tests/vnf/ims/cloudify_ims.py
index b3b0ee4a9..a0386f10d 100644
--- a/functest/opnfv_tests/vnf/ims/cloudify_ims.py
+++ b/functest/opnfv_tests/vnf/ims/cloudify_ims.py
@@ -296,7 +296,8 @@ class CloudifyIms(clearwater_ims_base.ClearwaterOnBoardingBase):
self.run_blocking_ssh_command(ssh, cmd)
cmd = "sudo chmod 444 /etc/cloudify/cloudify_ims.pem"
self.run_blocking_ssh_command(ssh, cmd)
- cmd = "sudo yum install -y gcc python-devel"
+ # cmd2 is badly unpinned by Cloudify
+ cmd = "sudo yum install -y gcc python-devel python-cmd2"
self.run_blocking_ssh_command(
ssh, cmd, "Unable to install packages on manager")
self.run_blocking_ssh_command(ssh, 'cfy status')
diff --git a/functest/opnfv_tests/vnf/router/cloudify_vrouter.py b/functest/opnfv_tests/vnf/router/cloudify_vrouter.py
index 11f30bf4d..f23906b70 100644
--- a/functest/opnfv_tests/vnf/router/cloudify_vrouter.py
+++ b/functest/opnfv_tests/vnf/router/cloudify_vrouter.py
@@ -297,7 +297,8 @@ class CloudifyVrouter(vrouter_base.VrouterOnBoardingBase):
self.run_blocking_ssh_command(ssh, cmd)
cmd = "sudo chmod 444 /etc/cloudify/cloudify_vrouter.pem"
self.run_blocking_ssh_command(ssh, cmd)
- cmd = "sudo yum install -y gcc python-devel"
+ # cmd2 is badly unpinned by Cloudify
+ cmd = "sudo yum install -y gcc python-devel python-cmd2"
self.run_blocking_ssh_command(
ssh, cmd, "Unable to install packages on manager")
else: