This is an automated email from the ASF dual-hosted git repository.
mykolabodnar pushed a commit to branch epm-2.5-preview1
in repository https://gitbox.apache.org/repos/asf/incubator-datalab.git
The following commit(s) were added to refs/heads/epm-2.5-preview1 by this push:
new 85a7ff0 [epm-2.5-preview1] - torre kernel fixed
85a7ff0 is described below
commit 85a7ff00653891b8dc6606bfc01923c676971a69
Author: bodnarmykola <[email protected]>
AuthorDate: Tue May 11 14:38:01 2021 +0300
[epm-2.5-preview1] - torre kernel fixed
---
infrastructure-provisioning/src/general/lib/os/fab.py | 4 ++--
infrastructure-provisioning/src/ssn/scripts/configure_docker.py | 9 ++++-----
2 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/infrastructure-provisioning/src/general/lib/os/fab.py
b/infrastructure-provisioning/src/general/lib/os/fab.py
index d59a2c8..3185b65 100644
--- a/infrastructure-provisioning/src/general/lib/os/fab.py
+++ b/infrastructure-provisioning/src/general/lib/os/fab.py
@@ -606,8 +606,8 @@ def ensure_toree_local_kernel(os_user, toree_link,
scala_kernel_path, files_dir,
conn.sudo('ln -s /opt/spark/ /usr/local/spark')
conn.sudo('jupyter toree install')
conn.sudo('mv ' + scala_kernel_path + 'lib/* /tmp/')
- #conn.put(files_dir + 'toree-assembly-0.3.0.jar',
'/tmp/toree-assembly-0.3.0.jar')
- #conn.sudo('mv /tmp/toree-assembly-0.3.0.jar ' + scala_kernel_path
+ 'lib/')
+ conn.put(files_dir + 'toree-assembly-0.5.0.jar',
'/tmp/toree-assembly-0.5.0.jar')
+ conn.sudo('mv /tmp/toree-assembly-0.5.0.jar ' + scala_kernel_path
+ 'lib/')
conn.sudo(
'sed -i "s|Apache Toree - Scala|Local Apache Toree - Scala
(Scala-' + scala_version +
', Spark-' + spark_version + ')|g" ' + scala_kernel_path +
'kernel.json')
diff --git a/infrastructure-provisioning/src/ssn/scripts/configure_docker.py
b/infrastructure-provisioning/src/ssn/scripts/configure_docker.py
index abae117..cbf75b0 100644
--- a/infrastructure-provisioning/src/ssn/scripts/configure_docker.py
+++ b/infrastructure-provisioning/src/ssn/scripts/configure_docker.py
@@ -61,13 +61,12 @@ def modify_conf_file(args):
def download_toree():
toree_path =
'/opt/datalab/sources/infrastructure-provisioning/src/general/files/os/'
- tarball_link =
'https://archive.apache.org/dist/incubator/toree/0.3.0-incubating/toree/toree-0.3.0-incubating-bin.tar.gz'
- jar_link =
'https://repo1.maven.org/maven2/org/apache/toree/toree-assembly/0.3.0-incubating/toree-assembly-0.3.0-incubating.jar'
+ tarball_link =
'https://dist.apache.org/repos/dist/dev/incubator/toree/0.5.0-incubating-rc1/toree/toree-0.5.0-incubating-bin.tar.gz'
try:
conn.run('wget {}'.format(tarball_link))
- conn.run('wget {}'.format(jar_link))
- conn.run('mv toree-0.3.0-incubating-bin.tar.gz
{}toree_kernel.tar.gz'.format(toree_path))
- conn.run('mv toree-assembly-0.3.0-incubating.jar
{}toree-assembly-0.3.0.jar'.format(toree_path))
+ conn.run('tar -xzf toree-0.5.0-incubating-bin.tar.gz)
+ conn.run('mv toree-0.5.0-incubating-bin.tar.gz
{}toree_kernel.tar.gz'.format(toree_path))
+ conn.run('mv
./toree-assembly-0.5.0-incubating/toree-assembly-0.5.0-incubating.jar
{}toree-assembly-0.5.0.jar'.format(toree_path))
except Exception as err:
traceback.print_exc()
print('Failed to download toree: ', str(err))
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
