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>
(cherry picked from commit 8b81b33530a9e46e7e6e7f8b81e752892bf9f2b9)

diff --git a/functest/opnfv_tests/vnf/ims/cloudify_ims.py b/functest/opnfv_tests/vnf/ims/cloudify_ims.py
index b3b0ee4..a0386f1 100644 (file)
--- 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 11f30bf..f23906b 100644 (file)
--- 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: