You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dlab.apache.org by om...@apache.org on 2019/03/28 16:11:13 UTC
[incubator-dlab] branch EPMCDLAB-1186 updated: fixed issue with
Downloading Toree
This is an automated email from the ASF dual-hosted git repository.
omartushevskyi pushed a commit to branch EPMCDLAB-1186
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
The following commit(s) were added to refs/heads/EPMCDLAB-1186 by this push:
new 62084c5 fixed issue with Downloading Toree
62084c5 is described below
commit 62084c5eb259a61fda57e44dea8fb0ca1d83672c
Author: Oleh Martushevskyi <Ol...@epam.com>
AuthorDate: Thu Mar 28 18:11:01 2019 +0200
fixed issue with Downloading Toree
---
.../scripts/deploy_repository/deploy_repository.py | 6 +++++-
.../src/general/lib/os/debian/common_lib.py | 1 -
.../src/ssn/scripts/configure_docker.py | 12 ++++++++++--
3 files changed, 15 insertions(+), 4 deletions(-)
diff --git a/infrastructure-provisioning/scripts/deploy_repository/deploy_repository.py b/infrastructure-provisioning/scripts/deploy_repository/deploy_repository.py
index a62335a..c1497a7 100644
--- a/infrastructure-provisioning/scripts/deploy_repository/deploy_repository.py
+++ b/infrastructure-provisioning/scripts/deploy_repository/deploy_repository.py
@@ -1197,7 +1197,11 @@ def download_packages():
'http://archive.cloudera.com/beta/livy/livy-server-{}.zip'.format(
configuration['notebook_livy_version']),
'https://dl.bintray.com/spark-packages/maven/tapanalyticstoolkit/spark-tensorflow-connector/'
- '1.0.0-s_2.11/spark-tensorflow-connector-1.0.0-s_2.11.jar'
+ '1.0.0-s_2.11/spark-tensorflow-connector-1.0.0-s_2.11.jar',
+ 'https://archive.apache.org/dist/incubator/toree/0.2.0-incubating/toree/'
+ 'toree-0.2.0-incubating-bin.tar.gz',
+ 'https://repo1.maven.org/maven2/org/apache/toree/toree-assembly/0.2.0-incubating/'
+ 'toree-assembly-0.2.0-incubating.jar'
]
packages_list = list()
for package in packages_urls:
diff --git a/infrastructure-provisioning/src/general/lib/os/debian/common_lib.py b/infrastructure-provisioning/src/general/lib/os/debian/common_lib.py
index 55fe771..85a8d5e 100644
--- a/infrastructure-provisioning/src/general/lib/os/debian/common_lib.py
+++ b/infrastructure-provisioning/src/general/lib/os/debian/common_lib.py
@@ -51,7 +51,6 @@ def ensure_pkg(user, requisites='linux-headers-generic python-pip python-dev '
if os.environ['conf_cloud_provider'] == 'aws':
sudo('apt-get -y install --install-recommends linux-aws-hwe')
except:
- time.sleep(3600)
sys.exit(1)
diff --git a/infrastructure-provisioning/src/ssn/scripts/configure_docker.py b/infrastructure-provisioning/src/ssn/scripts/configure_docker.py
index dfac293..872699f 100644
--- a/infrastructure-provisioning/src/ssn/scripts/configure_docker.py
+++ b/infrastructure-provisioning/src/ssn/scripts/configure_docker.py
@@ -55,10 +55,17 @@ def modify_conf_file(args):
sudo("python /tmp/configure_conf_file.py --dlab_dir {} --variables_list '{}'".format(
args.dlab_path, json.dumps(variables_list)))
+
def download_toree():
toree_path = '/opt/dlab/sources/infrastructure-provisioning/src/general/files/os/'
- tarball_link = 'https://archive.apache.org/dist/incubator/toree/0.2.0-incubating/toree/toree-0.2.0-incubating-bin.tar.gz'
- jar_link = 'https://repo1.maven.org/maven2/org/apache/toree/toree-assembly/0.2.0-incubating/toree-assembly-0.2.0-incubating.jar'
+ if os.environ['local_repository_enabled'] == 'True':
+ tarball_link = '{}/toree-0.2.0-incubating-bin.tar.gz'.format(os.environ['local_repository_packages_repo'])
+ jar_link = '{}/toree-assembly-0.2.0-incubating.jar'.format(os.environ['local_repository_packages_repo'])
+ else:
+ tarball_link = 'https://archive.apache.org/dist/incubator/toree/0.2.0-incubating/toree/' \
+ 'toree-0.2.0-incubating-bin.tar.gz'
+ jar_link = 'https://repo1.maven.org/maven2/org/apache/toree/toree-assembly/0.2.0-incubating/' \
+ 'toree-assembly-0.2.0-incubating.jar'
try:
run('wget {}'.format(tarball_link))
run('wget {}'.format(jar_link))
@@ -69,6 +76,7 @@ def download_toree():
print('Failed to download toree: ', str(err))
sys.exit(1)
+
def update_repository(dlab_path, repository_host, region):
with cd('{}sources/infrastructure-provisioning/src/general/files/aws/'.format(dlab_path)):
if region == 'cn-north-1':
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org