[incubator-dlab] branch DLAB-515 updated: [DLAB-515] - dataengine-service libs installing fixed

[my...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

mykolabodnar pushed a commit to branch DLAB-515
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git


The following commit(s) were added to refs/heads/DLAB-515 by this push:
     new c0aae69  [DLAB-515] - dataengine-service libs installing fixed
c0aae69 is described below

commit c0aae69d07f8645efb942a69d6804944187cbc67
Author: bodnarmykola <bo...@gmail.com>
AuthorDate: Fri Jun 19 13:47:43 2020 +0300

    [DLAB-515] - dataengine-service libs installing fixed
---
 infrastructure-provisioning/src/general/lib/os/fab.py | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/infrastructure-provisioning/src/general/lib/os/fab.py b/infrastructure-provisioning/src/general/lib/os/fab.py
index ffe0169..dc0116c 100644
--- a/infrastructure-provisioning/src/general/lib/os/fab.py
+++ b/infrastructure-provisioning/src/general/lib/os/fab.py
@@ -57,7 +57,9 @@ def install_pip_pkg(requisites, pip_version, lib_group):
     error_parser = "Could not|No matching|ImportError:|failed|EnvironmentError:"
     try:
         if pip_version == 'pip3' and not exists('/bin/pip3'):
-            sudo('ln -s /bin/pip3.7 /bin/pip3')
+            for v in range(4, 8):
+                if exists('/bin/pip3.{}'.format(v)):
+                    sudo('ln -s /bin/pip3.{} /bin/pip3'.format(v))
         sudo('{} install -U pip=={} setuptools'.format(pip_version, os.environ['conf_pip_version']))
         sudo('{} install -U pip=={} --no-cache-dir'.format(pip_version, os.environ['conf_pip_version']))
         sudo('{} install --upgrade pip=={}'.format(pip_version, os.environ['conf_pip_version']))
@@ -661,8 +663,8 @@ def configure_data_engine_service_pip(hostname, os_user, keyfile):
     elif not exists('/usr/bin/pip3') and sudo("python3.7 -V 2>/dev/null | awk '{print $2}'"):
         manage_pkg('-y install', 'remote', 'python3-pip')
         sudo('ln -s /usr/bin/pip-3.7 /usr/bin/pip3')
-    sudo('sudo pip3 install -U pip=={} setuptools'.format(os.environ['conf_pip_version']))
-    sudo('sudo pip2 install -U pip=={} setuptools'.format(os.environ['conf_pip_version']))
+    #sudo('sudo pip3 install -U pip=={} setuptools'.format(os.environ['conf_pip_version']))
+    #sudo('sudo pip2 install -U pip=={} setuptools'.format(os.environ['conf_pip_version']))
     sudo('echo "export PATH=$PATH:/usr/local/bin" >> /etc/profile')
     sudo('source /etc/profile')
     run('source /etc/profile')


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org