From: rakeshgm <rakeshgm014@gmail.com>
Date: Tue, 10 Dec 2019 17:13:35 +0000 (+0530)
Subject: forcing tests to start using python3 in virtualenv
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=85dc47555bb3d3af207be9e1548284ad18fded57;p=ceph.git

forcing tests to start using python3 in virtualenv

Signed-off-by: rakeshgm <rakeshgm014@gmail.com>
---

diff --git a/qa/tasks/nfs_ganesha_rgw_v2.py b/qa/tasks/nfs_ganesha_rgw_v2.py
index 632ba06db1f..2c8254049cf 100644
--- a/qa/tasks/nfs_ganesha_rgw_v2.py
+++ b/qa/tasks/nfs_ganesha_rgw_v2.py
@@ -104,7 +104,7 @@ def task(ctx, config):
 
     rgw[0].run(args=['cd', 'nfs_ganesha_rgw/ceph-qe-scripts', run.Raw(';'), 'git', 'checkout', '%s' % branch])
 
-    rgw[0].run(args=['virtualenv', 'venv'])
+    rgw[0].run(args=['python3', '-m', 'venv', 'venv'])
 
     rgw[0].run(
         args=[
@@ -156,7 +156,7 @@ def task(ctx, config):
 
     rgw[0].run(
         args=[run.Raw(
-            'sudo venv/bin/python2.7 nfs_ganesha_rgw/ceph-qe-scripts/rgw/v2/tests/nfs_ganesha/%s '
+            'sudo venv/bin/python3 nfs_ganesha_rgw/ceph-qe-scripts/rgw/v2/tests/nfs_ganesha/%s '
             '-r nfs_ganesha_rgw/ceph-qe-scripts/rgw/v2/tests/nfs_ganesha/config/rgw_user.yaml '
             '-c nfs_ganesha_rgw/ceph-qe-scripts/rgw/v2/tests/nfs_ganesha/config/%s ' % (script_name, test_name))])
 
diff --git a/qa/tasks/rgw_longrunning.py b/qa/tasks/rgw_longrunning.py
index f97d8f403fe..4b77fee4953 100644
--- a/qa/tasks/rgw_longrunning.py
+++ b/qa/tasks/rgw_longrunning.py
@@ -156,7 +156,7 @@ def task(ctx, config):
                                                    DIR[config.get('test_version', 'v2')]['config'])])
     clients[0].run(args=['cat', config_file])
     # os.remove(local_file)
-    clients[0].run(args=['virtualenv', 'venv'])
+    clients[0].run(args=['python3', '-m', 'venv', 'venv'])
     clients[0].run(
         args=[
             'source',
@@ -172,7 +172,7 @@ def task(ctx, config):
     time.sleep(60)
     clients[0].run(
         args=[run.Raw(
-            'sudo venv/bin/python2.7 %s -c %s ' % (script, config_file))])
+            'sudo venv/bin/python3 %s -c %s ' % (script, config_file))])
     try:
         yield
     finally:
diff --git a/qa/tasks/rgw_system_test.py b/qa/tasks/rgw_system_test.py
index 22d491f9ad6..fcda800aff8 100644
--- a/qa/tasks/rgw_system_test.py
+++ b/qa/tasks/rgw_system_test.py
@@ -95,7 +95,7 @@ def task(ctx, config):
                                                        DIR[config.get('test_version', 'v2')]['config'])])
             remote.run(args=['cat', config_file])
             # os.remove(local_file)
-        remote.run(args=['virtualenv', 'venv'])
+        remote.run(args=['python3', '-m', 'venv', 'venv'])
         remote.run(
             args=[
                 'source',
@@ -112,7 +112,7 @@ def task(ctx, config):
         time.sleep(60)
         remote.run(
             args=[run.Raw(
-                'sudo venv/bin/python2.7 %s -c %s ' % (script, config_file))])
+                'sudo venv/bin/python3 %s -c %s ' % (script, config_file))])
     try:
         yield
     finally: