You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dlab.apache.org by lf...@apache.org on 2020/06/24 10:35:14 UTC
[incubator-dlab] branch DLAB-1855 updated (be4a83a -> bdd1176)
This is an automated email from the ASF dual-hosted git repository.
lfrolov pushed a change to branch DLAB-1855
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git.
from be4a83a [DLAB-1855]: changed pip update during dataengine service creation
add a6ebe55 [DLAB-515] - GPG update disabled/HTTPS proxy for apt added
add 873bab8 [DLAB-515] - dataproc fixed
add a45445c [DLAB-515] - GPG key renewal changed
add 7998afa Merge pull request #795 from apache/DLAB-1855
add 2f3ec2e Merge remote-tracking branch 'origin/DLAB-515' into DLAB-515
add c0aae69 [DLAB-515] - dataengine-service libs installing fixed
new a33f75d [DLAB-1855]: changed pip update during dataengine service creation
new bdd1176 Merge branch 'DLAB-1855' of https://github.com/apache/incubator-dlab into DLAB-1855
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../src/general/files/gcp/dataengine-service_description.json | 2 +-
infrastructure-provisioning/src/general/lib/os/debian/common_lib.py | 4 ++--
infrastructure-provisioning/src/general/lib/os/debian/notebook_lib.py | 2 ++
3 files changed, 5 insertions(+), 3 deletions(-)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org
[incubator-dlab] 01/02: [DLAB-1855]: changed pip update during
dataengine service creation
Posted by lf...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
lfrolov pushed a commit to branch DLAB-1855
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
commit a33f75d5252bac99926a6731c589bb7e47764ec8
Author: leonidfrolov <fr...@gmail.com>
AuthorDate: Tue Jun 23 20:06:56 2020 +0300
[DLAB-1855]: changed pip update during dataengine service creation
---
infrastructure-provisioning/src/general/lib/os/fab.py | 8 +++++---
.../src/general/scripts/aws/dataengine-service_configure.py | 2 +-
2 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/infrastructure-provisioning/src/general/lib/os/fab.py b/infrastructure-provisioning/src/general/lib/os/fab.py
index dc0116c..d664a5b 100644
--- a/infrastructure-provisioning/src/general/lib/os/fab.py
+++ b/infrastructure-provisioning/src/general/lib/os/fab.py
@@ -642,7 +642,7 @@ def add_breeze_library_local(os_user):
sys.exit(1)
-def configure_data_engine_service_pip(hostname, os_user, keyfile):
+def configure_data_engine_service_pip(hostname, os_user, keyfile, emr=False):
env['connection_attempts'] = 100
env.key_filename = [keyfile]
env.host_string = os_user + '@' + hostname
@@ -663,8 +663,10 @@ 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']))
+ if emr:
+ sudo('pip3 install -U pip=={}'.format(os.environ['conf_pip_version']))
+ sudo('pip2 install -U pip=={}'.format(os.environ['conf_pip_version']))
+ sudo('ln -s /usr/local/bin/pip3.7 /bin/pip3.7')
sudo('echo "export PATH=$PATH:/usr/local/bin" >> /etc/profile')
sudo('source /etc/profile')
run('source /etc/profile')
diff --git a/infrastructure-provisioning/src/general/scripts/aws/dataengine-service_configure.py b/infrastructure-provisioning/src/general/scripts/aws/dataengine-service_configure.py
index 9e9fb40..2245282 100644
--- a/infrastructure-provisioning/src/general/scripts/aws/dataengine-service_configure.py
+++ b/infrastructure-provisioning/src/general/scripts/aws/dataengine-service_configure.py
@@ -81,7 +81,7 @@ def configure_dataengine_service(instance, emr_conf):
print('[CONFIGURE DATAENGINE SERVICE]')
try:
dlab.fab.configure_data_engine_service_pip(emr_conf['instance_ip'], emr_conf['os_user'],
- emr_conf['key_path'])
+ emr_conf['key_path'], True)
env['connection_attempts'] = 100
env.key_filename = emr_conf['key_path']
env.host_string = emr_conf['os_user'] + '@' + emr_conf['instance_ip']
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org
[incubator-dlab] 02/02: Merge branch 'DLAB-1855' of
https://github.com/apache/incubator-dlab into DLAB-1855
Posted by lf...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
lfrolov pushed a commit to branch DLAB-1855
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
commit bdd11763dd82efb24871191963a7ebad22a398f7
Merge: a33f75d be4a83a
Author: leonidfrolov <fr...@gmail.com>
AuthorDate: Wed Jun 24 13:34:54 2020 +0300
Merge branch 'DLAB-1855' of https://github.com/apache/incubator-dlab into DLAB-1855
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org