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/07/29 11:31:35 UTC
[incubator-dlab] branch DLAB-1966 updated (554c79a -> 9958adc)
This is an automated email from the ASF dual-hosted git repository.
lfrolov pushed a change to branch DLAB-1966
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git.
from 554c79a [DLAB-1966]: added removal of apt package from it`s dependencies list
new 587a644 [DLAB-1966]: removed '***' from available versions list
new 9958adc [DLAB-1966]: added additional package installation for gcp
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/lib/os/debian/notebook_lib.py | 6 +++---
.../src/general/scripts/os/install_additional_libs.py | 7 +++++--
2 files changed, 8 insertions(+), 5 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-1966]: removed '***' from available
versions list
Posted by lf...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
lfrolov pushed a commit to branch DLAB-1966
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
commit 587a644f7ebbf747fc09a90ef42ced13430fff77
Author: leonidfrolov <fr...@gmail.com>
AuthorDate: Wed Jul 29 13:21:58 2020 +0300
[DLAB-1966]: removed '***' from available versions list
---
.../src/general/lib/os/debian/notebook_lib.py | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/infrastructure-provisioning/src/general/lib/os/debian/notebook_lib.py b/infrastructure-provisioning/src/general/lib/os/debian/notebook_lib.py
index 5e1b151..bfd4314 100644
--- a/infrastructure-provisioning/src/general/lib/os/debian/notebook_lib.py
+++ b/infrastructure-provisioning/src/general/lib/os/debian/notebook_lib.py
@@ -387,8 +387,7 @@ def install_os_pkg(requisites):
dep = []
else:
dep = dep[len(new_pkgs_parser): dep.find(" upgraded, ") - 1].replace('\r', '') \
- .replace('\n', '').replace(' ', ' ').replace(' {} '.format(os_pkg.split("=")[0]),
- ' ').strip().split(' ')
+ .replace('\n', '').replace(' ', ' ').strip().split(' ')
for n, i in enumerate(dep):
if i == os_pkg.split("=")[0]:
dep[n] = ''
@@ -408,7 +407,8 @@ def install_os_pkg(requisites):
version = [i for i in ver if os_pkg.split("=")[0] in i][0].split(' ')[1]
status_msg = "installed"
if 'E: Version' in err and 'was not found' in err:
- versions = sudo ('apt-cache policy {} | grep 500 | grep -v Packages'.format(os_pkg.split("=")[0])).replace('\r\n', '').replace(' 500', '').replace(' ', ' ').strip().split(' ')
+ versions = sudo ('apt-cache policy {} | grep 500 | grep -v Packages'.format(os_pkg.split("=")[0]))\
+ .replace('\r\n', '').replace(' 500', '').replace(' ', ' ').replace('***', '').strip().split(' ')
if versions != '':
status_msg = 'invalid_version'
status.append({"group": "os_pkg", "name": os_pkg.split("=")[0], "version": version, "status": status_msg,
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org
[incubator-dlab] 02/02: [DLAB-1966]: added additional package
installation for gcp
Posted by lf...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
lfrolov pushed a commit to branch DLAB-1966
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
commit 9958adc3b40bea0b736be00f9a116925c0227278
Author: leonidfrolov <fr...@gmail.com>
AuthorDate: Wed Jul 29 14:31:17 2020 +0300
[DLAB-1966]: added additional package installation for gcp
---
.../src/general/scripts/os/install_additional_libs.py | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/infrastructure-provisioning/src/general/scripts/os/install_additional_libs.py b/infrastructure-provisioning/src/general/scripts/os/install_additional_libs.py
index 075175c..dc8a804 100644
--- a/infrastructure-provisioning/src/general/scripts/os/install_additional_libs.py
+++ b/infrastructure-provisioning/src/general/scripts/os/install_additional_libs.py
@@ -115,8 +115,11 @@ if __name__ == "__main__":
or os.environ['application'] in ('rstudio', 'tensor-rstudio'):
try:
print('Installing R packages: {}'.format(pkgs['libraries']['r_pkg']))
- if os.environ['conf_resource'] in ('dataengine-service'):
- manage_pkg('-y install', 'remote', 'libcurl libcurl-devel')
+ if os.environ['conf_resource'] in ('dataengine-service') :
+ if os.environ['conf_cloud_provider'] in ('aws'):
+ manage_pkg('-y install', 'remote', 'libcurl libcurl-devel')
+ elif os.environ['conf_cloud_provider'] in ('gcp'):
+ manage_pkg('-y install', 'remote', 'libcurl4-gnutls-dev')
sudo('R -e "install.packages(\'devtools\', repos = \'https://cloud.r-project.org\')"')
status = install_r_pkg(pkgs['libraries']['r_pkg'])
general_status = general_status + status
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org