This is an automated email from the ASF dual-hosted git repository.
olehmykolaishyn pushed a commit to branch 2.5.1-tensor-jupyterlab
in repository https://gitbox.apache.org/repos/asf/incubator-datalab.git
The following commit(s) were added to refs/heads/2.5.1-tensor-jupyterlab by
this push:
new ade6d93 addition edits for tensor-jupyterlab
ade6d93 is described below
commit ade6d934e396e0ee4eb8c9ec1a79dd0b2d5565c0
Author: oleh_mykolaishyn <[email protected]>
AuthorDate: Wed Feb 16 13:41:26 2022 +0200
addition edits for tensor-jupyterlab
---
.../general/files/aws/tensor-jupyterlab_Dockerfile | 2 +-
.../src/general/scripts/aws/ssn_configure.py | 1 +
.../general/scripts/os/common_clean_instance.py | 26 ++++++++++++++++++++++
.../aws/jenkins_jobs/create_data_engine/config.xml | 1 +
.../jenkins_jobs/create_notebook_server/config.xml | 1 +
.../jenkins_jobs/start_notebook_server/config.xml | 1 +
.../jenkins_jobs/stop_notebook_server/config.xml | 1 +
.../terminate_notebook_server/config.xml | 1 +
.../src/tensor-jupyterlab/fabfile.py | 2 +-
.../terraform/bin/deploy/endpoint_fab.py | 2 +-
.../terraform/gcp/endpoint/provisioning.py | 7 ++++++
.../core/commands/CommandExecutorMock.java | 3 ++-
.../epam/datalab/backendapi/util/BillingUtils.java | 2 +-
13 files changed, 45 insertions(+), 5 deletions(-)
diff --git
a/infrastructure-provisioning/src/general/files/aws/tensor-jupyterlab_Dockerfile
b/infrastructure-provisioning/src/general/files/aws/tensor-jupyterlab_Dockerfile
index dc3342e..c61ba5d 100644
---
a/infrastructure-provisioning/src/general/files/aws/tensor-jupyterlab_Dockerfile
+++
b/infrastructure-provisioning/src/general/files/aws/tensor-jupyterlab_Dockerfile
@@ -26,7 +26,7 @@ ARG OS
COPY tensor-jupyterlab/ /root/
COPY general/scripts/os/* /root/scripts/
-COPY general/scripts/aws/tensor_* /root/scripts/
+COPY general/scripts/aws/tensor-jupyterlab_* /root/scripts/
COPY general/lib/os/${OS}/notebook_lib.py
/usr/lib/python3.8/datalab/notebook_lib.py
COPY general/templates/os/${OS}/jupyterlab-notebook.service /root/templates/
COPY general/templates/os/${OS}/ungit.service /root/templates/
diff --git
a/infrastructure-provisioning/src/general/scripts/aws/ssn_configure.py
b/infrastructure-provisioning/src/general/scripts/aws/ssn_configure.py
index efc3a75..afa5fd0 100644
--- a/infrastructure-provisioning/src/general/scripts/aws/ssn_configure.py
+++ b/infrastructure-provisioning/src/general/scripts/aws/ssn_configure.py
@@ -203,6 +203,7 @@ if __name__ == "__main__":
{"name": "zeppelin", "tag": "latest"},
{"name": "tensor", "tag": "latest"},
{"name": "tensor-rstudio", "tag": "latest"},
+ {"name": "tensor-jupyterlab", "tag": "latest"},
{"name": "jupyterlab", "tag": "latest"},
{"name": "deeplearning", "tag": "latest"},
{"name": "dataengine-service", "tag": "latest"},
diff --git
a/infrastructure-provisioning/src/general/scripts/os/common_clean_instance.py
b/infrastructure-provisioning/src/general/scripts/os/common_clean_instance.py
index 548e931..79049df 100644
---
a/infrastructure-provisioning/src/general/scripts/os/common_clean_instance.py
+++
b/infrastructure-provisioning/src/general/scripts/os/common_clean_instance.py
@@ -67,6 +67,20 @@ def clean_jupyter():
print('Error: {0}'.format(err))
sys.exit(1)
+def clean_jupyterlab():
+ try:
+ conn.sudo('systemctl stop jupyterlab-notebook')
+ conn.sudo('pip3 uninstall -y jupyterlab')
+ #conn.sudo('rm -rf /usr/local/share/jupyter/')
+ conn.sudo('rm -rf /home/{}/.jupyter/'.format(args.os_user))
+ conn.sudo('rm -rf /home/{}/.ipython/'.format(args.os_user))
+ conn.sudo('rm -rf /home/{}/.ipynb_checkpoints/'.format(args.os_user))
+ conn.sudo('rm -rf /home/{}/.local/share/jupyter/'.format(args.os_user))
+ conn.sudo('rm -f /etc/systemd/system/jupyterlab-notebook.service')
+ conn.sudo('systemctl daemon-reload')
+ except Exception as err:
+ print('Error: {0}'.format(err))
+ sys.exit(1)
def clean_zeppelin():
try:
@@ -114,6 +128,16 @@ def clean_tensor_rstudio():
print('Error: {0}'.format(err))
sys.exit(1)
+def clean_tensor_jupyterlab():
+ try:
+ clean_jupyterlab()
+ conn.sudo('systemctl stop tensorboard')
+ conn.sudo('systemctl disable tensorboard')
+ conn.sudo('systemctl daemon-reload')
+ except Exception as err:
+ print('Error: {0}'.format(err))
+ sys.exit(1)
+
def clean_deeplearning():
try:
conn.sudo('systemctl stop ungit')
@@ -178,6 +202,8 @@ if __name__ == "__main__":
clean_tensor()
elif args.application == 'tensor-rstudio':
clean_tensor_rstudio()
+ elif args.application == 'tensor-jupyterlab':
+ clean_tensor_jupyterlab()
else:
print('Found default ami, do not make clean')
#conn.close()
diff --git
a/infrastructure-provisioning/src/general/templates/aws/jenkins_jobs/create_data_engine/config.xml
b/infrastructure-provisioning/src/general/templates/aws/jenkins_jobs/create_data_engine/config.xml
index 8c993b3..a0339e5 100644
---
a/infrastructure-provisioning/src/general/templates/aws/jenkins_jobs/create_data_engine/config.xml
+++
b/infrastructure-provisioning/src/general/templates/aws/jenkins_jobs/create_data_engine/config.xml
@@ -77,6 +77,7 @@ under the License.
<string>zeppelin</string>
<string>tensor</string>
<string>tensor-rstudio</string>
+ <string>tensor-jupyterlab</string>
</a>
</choices>
</hudson.model.ChoiceParameterDefinition>
diff --git
a/infrastructure-provisioning/src/general/templates/aws/jenkins_jobs/create_notebook_server/config.xml
b/infrastructure-provisioning/src/general/templates/aws/jenkins_jobs/create_notebook_server/config.xml
index abacbb1..bd128f7 100644
---
a/infrastructure-provisioning/src/general/templates/aws/jenkins_jobs/create_notebook_server/config.xml
+++
b/infrastructure-provisioning/src/general/templates/aws/jenkins_jobs/create_notebook_server/config.xml
@@ -41,6 +41,7 @@ under the License.
<string>zeppelin</string>
<string>tensor</string>
<string>tensor-rstudio</string>
+ <string>tensor-jupyterlab</string>
<string>deeplearning</string>
<string>jupyterlab</string>
</a>
diff --git
a/infrastructure-provisioning/src/general/templates/aws/jenkins_jobs/start_notebook_server/config.xml
b/infrastructure-provisioning/src/general/templates/aws/jenkins_jobs/start_notebook_server/config.xml
index ba6a405..cb03b84 100644
---
a/infrastructure-provisioning/src/general/templates/aws/jenkins_jobs/start_notebook_server/config.xml
+++
b/infrastructure-provisioning/src/general/templates/aws/jenkins_jobs/start_notebook_server/config.xml
@@ -46,6 +46,7 @@ under the License.
<string>zeppelin</string>
<string>tensor</string>
<string>tensor-rstudio</string>
+ <string>tensor-jupyterlab</string>
<string>jupyterlab</string>
</a>
</choices>
diff --git
a/infrastructure-provisioning/src/general/templates/aws/jenkins_jobs/stop_notebook_server/config.xml
b/infrastructure-provisioning/src/general/templates/aws/jenkins_jobs/stop_notebook_server/config.xml
index 906d0ca..e9e9bc4 100644
---
a/infrastructure-provisioning/src/general/templates/aws/jenkins_jobs/stop_notebook_server/config.xml
+++
b/infrastructure-provisioning/src/general/templates/aws/jenkins_jobs/stop_notebook_server/config.xml
@@ -46,6 +46,7 @@ under the License.
<string>zeppelin</string>
<string>tensor</string>
<string>tensor-rstudio</string>
+ <string>tensor-jupyterlab</string>
<string>jupyterlab</string>
</a>
</choices>
diff --git
a/infrastructure-provisioning/src/general/templates/aws/jenkins_jobs/terminate_notebook_server/config.xml
b/infrastructure-provisioning/src/general/templates/aws/jenkins_jobs/terminate_notebook_server/config.xml
index d6b726a..e6d77ab 100644
---
a/infrastructure-provisioning/src/general/templates/aws/jenkins_jobs/terminate_notebook_server/config.xml
+++
b/infrastructure-provisioning/src/general/templates/aws/jenkins_jobs/terminate_notebook_server/config.xml
@@ -46,6 +46,7 @@ under the License.
<string>zeppelin</string>
<string>tensor</string>
<string>tensor-rstudio</string>
+ <string>tensor-jupyterlab</string>
<string>jupyterlab</string>
</a>
</choices>
diff --git a/infrastructure-provisioning/src/tensor-jupyterlab/fabfile.py
b/infrastructure-provisioning/src/tensor-jupyterlab/fabfile.py
index b6d0e16..133eb08 100644
--- a/infrastructure-provisioning/src/tensor-jupyterlab/fabfile.py
+++ b/infrastructure-provisioning/src/tensor-jupyterlab/fabfile.py
@@ -54,7 +54,7 @@ def run(ctx):
try:
params = "--uuid {}".format(notebook_config['uuid'])
- subprocess.run("~/scripts/{}.py {}".format('tensor_configure',
params), shell=True, check=True)
+ subprocess.run("~/scripts/{}.py
{}".format('tensor-jupyterlab_configure', params), shell=True, check=True)
except Exception as err:
traceback.print_exc()
append_result("Failed configuring Notebook node.", str(err))
diff --git a/infrastructure-provisioning/terraform/bin/deploy/endpoint_fab.py
b/infrastructure-provisioning/terraform/bin/deploy/endpoint_fab.py
index e5bd059..4f821a0 100644
--- a/infrastructure-provisioning/terraform/bin/deploy/endpoint_fab.py
+++ b/infrastructure-provisioning/terraform/bin/deploy/endpoint_fab.py
@@ -639,7 +639,7 @@ def pull_docker_images():
if not exists(conn, ensure_file):
list_images = {
'aws': ['base', 'edge', 'project', 'jupyter', 'rstudio',
'zeppelin', 'tensor', 'tensor-rstudio',
- 'deeplearning', 'jupyterlab', 'dataengine-service',
'dataengine'],
+ 'tensor-jupyterlab', 'deeplearning', 'jupyterlab',
'dataengine-service', 'dataengine'],
'gcp': ['base', 'edge', 'project', 'jupyter', 'rstudio',
'zeppelin', 'tensor', 'tensor-rstudio',
'deeplearning', 'superset', 'jupyterlab',
'dataengine-service', 'dataengine'],
'azure': ['base', 'edge', 'project', 'jupyter', 'rstudio',
'zeppelin', 'tensor', 'deeplearning',
diff --git a/infrastructure-provisioning/terraform/gcp/endpoint/provisioning.py
b/infrastructure-provisioning/terraform/gcp/endpoint/provisioning.py
index ed83bb6..482d501 100644
--- a/infrastructure-provisioning/terraform/gcp/endpoint/provisioning.py
+++ b/infrastructure-provisioning/terraform/gcp/endpoint/provisioning.py
@@ -410,6 +410,8 @@ def pull_docker_images():
.format(args.repository_address, args.repository_port,
args.cloud_provider))
conn.sudo('docker pull {}:{}/docker.datalab-tensor-rstudio-{}'
.format(args.repository_address, args.repository_port,
args.cloud_provider))
+ conn.sudo('docker pull {}:{}/docker.datalab-tensor-jupyterlab-{}'
+ .format(args.repository_address, args.repository_port,
args.cloud_provider))
conn.sudo('docker pull {}:{}/docker.datalab-deeplearning-{}'
.format(args.repository_address, args.repository_port,
args.cloud_provider))
conn.sudo('docker pull {}:{}/docker.datalab-dataengine-service-{}'
@@ -434,6 +436,9 @@ def pull_docker_images():
conn.sudo('docker tag {}:{}/docker.datalab-tensor-rstudio-{} '
'docker.datalab-tensor-rstudio'
.format(args.repository_address, args.repository_port,
args.cloud_provider))
+ conn.sudo('docker tag {}:{}/docker.datalab-tensor-jupyterlab-{} '
+ 'docker.datalab-tensor-jupyterlab'
+ .format(args.repository_address, args.repository_port,
args.cloud_provider))
conn.sudo('docker tag {}:{}/docker.datalab-deeplearning-{} '
'docker.datalab-deeplearning'
.format(args.repository_address, args.repository_port,
args.cloud_provider))
@@ -459,6 +464,8 @@ def pull_docker_images():
.format(args.repository_address, args.repository_port,
args.cloud_provider))
conn.sudo('docker rmi {}:{}/docker.datalab-tensor-rstudio-{}'
.format(args.repository_address, args.repository_port,
args.cloud_provider))
+ conn.sudo('docker rmi {}:{}/docker.datalab-tensor-jupyterlab-{}'
+ .format(args.repository_address, args.repository_port,
args.cloud_provider))
conn.sudo('docker rmi {}:{}/docker.datalab-deeplearning-{}'
.format(args.repository_address, args.repository_port,
args.cloud_provider))
conn.sudo('docker rmi {}:{}/docker.datalab-dataengine-service-{}'
diff --git
a/services/provisioning-service/src/main/java/com/epam/datalab/backendapi/core/commands/CommandExecutorMock.java
b/services/provisioning-service/src/main/java/com/epam/datalab/backendapi/core/commands/CommandExecutorMock.java
index 33bd495..43b8b96 100644
---
a/services/provisioning-service/src/main/java/com/epam/datalab/backendapi/core/commands/CommandExecutorMock.java
+++
b/services/provisioning-service/src/main/java/com/epam/datalab/backendapi/core/commands/CommandExecutorMock.java
@@ -83,7 +83,8 @@ public class CommandExecutorMock implements ICommandExecutor {
"docker.datalab-rstudio:latest",
"docker.datalab-tensor:latest",
"docker.datalab-zeppelin:latest",
- "docker.datalab-tensor-rstudio:latest");
+ "docker.datalab-tensor-rstudio:latest",
+ "docker.datalab-tensor-jupyterlab:latest");
list.addAll(getComputationalDockerImage());
diff --git
a/services/self-service/src/main/java/com/epam/datalab/backendapi/util/BillingUtils.java
b/services/self-service/src/main/java/com/epam/datalab/backendapi/util/BillingUtils.java
index fe9575f..21a342c 100644
---
a/services/self-service/src/main/java/com/epam/datalab/backendapi/util/BillingUtils.java
+++
b/services/self-service/src/main/java/com/epam/datalab/backendapi/util/BillingUtils.java
@@ -39,7 +39,7 @@ import static
com.epam.datalab.dto.billing.BillingResourceType.*;
@Slf4j
public class BillingUtils {
- private static final String[] AVAILABLE_NOTEBOOKS = {"zeppelin",
"tensor-rstudio", "rstudio", "tensor", "superset", "jupyterlab", "jupyter",
"deeplearning"};
+ private static final String[] AVAILABLE_NOTEBOOKS = {"zeppelin",
"tensor-rstudio", "tensor-jupyterlab","rstudio", "tensor", "superset",
"jupyterlab", "jupyter", "deeplearning"};
private static final String[] BILLING_FILTERED_REPORT_HEADERS = {"DataLab
ID", "Project", "DataLab Resource Type", "Status", "Shape", "Product", "Cost"};
private static final String[] COMPLETE_REPORT_REPORT_HEADERS = {"DataLab
ID", "User", "Project", "DataLab Resource Type", "Status", "Shape", "Product",
"Cost"};
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
