You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@datalab.apache.org by lf...@apache.org on 2020/10/05 09:01:30 UTC
[incubator-datalab] branch DATALAB-2080 created (now c682c21)
This is an automated email from the ASF dual-hosted git repository.
lfrolov pushed a change to branch DATALAB-2080
in repository https://gitbox.apache.org/repos/asf/incubator-datalab.git.
at c682c21 [DLAB-2080]: replaced old name in files
This branch includes the following new commits:
new c682c21 [DLAB-2080]: replaced old name in files
The 1 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.
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@datalab.apache.org
For additional commands, e-mail: commits-help@datalab.apache.org
[incubator-datalab] 01/01: [DLAB-2080]: replaced old name in files
Posted by lf...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
lfrolov pushed a commit to branch DATALAB-2080
in repository https://gitbox.apache.org/repos/asf/incubator-datalab.git
commit c682c21600766d92415bef2d4f6a1c6b34c897ef
Author: leonidfrolov <fr...@gmail.com>
AuthorDate: Mon Oct 5 12:01:06 2020 +0300
[DLAB-2080]: replaced old name in files
---
.../scripts/deploy_repository/deploy_repository.py | 2 +-
.../scripts/deploy_repository/templates/configureNexus.groovy | 8 ++++----
.../main/datalab-ui-chart/templates/configmap-ui-conf.yaml | 2 +-
.../terraform/bin/deploy/endpoint_fab.py | 2 +-
.../terraform/gcp/endpoint/provisioning.py | 2 +-
.../datalab-ui-chart/templates/configmap-ui-conf.yaml | 2 +-
integration-tests/examples/copy_files.py | 2 +-
.../deeplearning/template_preparation_tensor.ipynb | 10 +++++-----
.../deeplearning/template_visualization_tensor.ipynb | 6 +++---
.../test_templates/tensor/template_preparation_tensor.ipynb | 10 +++++-----
.../test_templates/tensor/template_visualization_tensor.ipynb | 6 +++---
11 files changed, 26 insertions(+), 26 deletions(-)
diff --git a/infrastructure-provisioning/scripts/deploy_repository/deploy_repository.py b/infrastructure-provisioning/scripts/deploy_repository/deploy_repository.py
index c3e738f..0d05532 100644
--- a/infrastructure-provisioning/scripts/deploy_repository/deploy_repository.py
+++ b/infrastructure-provisioning/scripts/deploy_repository/deploy_repository.py
@@ -62,7 +62,7 @@ parser.add_argument('--primary_disk_size', type=str, default='30', help="Disk si
parser.add_argument('--additional_disk_size', type=str, default='50', help="Disk size of additional volume")
parser.add_argument('--datalab_conf_file_path', type=str, default='', help="Full path to DataLab conf file")
parser.add_argument('--nexus_admin_password', type=str, default='', help="Password for Nexus admin user")
-parser.add_argument('--nexus_service_user_name', type=str, default='dlab-nexus', help="Nexus service user name")
+parser.add_argument('--nexus_service_user_name', type=str, default='datalab-nexus', help="Nexus service user name")
parser.add_argument('--nexus_service_user_password', type=str, default='', help="Nexus service user password")
parser.add_argument('--action', required=True, type=str, default='', help='Action: create or terminate')
args = parser.parse_args()
diff --git a/infrastructure-provisioning/scripts/deploy_repository/templates/configureNexus.groovy b/infrastructure-provisioning/scripts/deploy_repository/templates/configureNexus.groovy
index 54608ac..12469b1 100644
--- a/infrastructure-provisioning/scripts/deploy_repository/templates/configureNexus.groovy
+++ b/infrastructure-provisioning/scripts/deploy_repository/templates/configureNexus.groovy
@@ -62,9 +62,9 @@ repository.createRawProxy('amazon-updates','AMAZON_UPDATES_URL', 'packages_store
// create a role for service user
def role = new org.sonatype.nexus.security.role.Role(
- roleId: "nx-dlab",
+ roleId: "nx-datalab",
source: "Nexus",
- name: "nx-dlab",
+ name: "nx-datalab",
description: null,
readOnly: false,
privileges: [ 'nx-repository-view-*-*-*' ],
@@ -74,8 +74,8 @@ authorizationManager.addRole(role)
// add a service user account
security.addUser("SERVICE_USER_NAME",
- "DLab", "Nexus",
- "dlab-nexus@example.org", true,
+ "DataLab", "Nexus",
+ "datalab-nexus@example.org", true,
"SERVICE_USER_PASSWORD", [ role.roleId ])
security.securitySystem.changePassword('admin','ADMIN_PASSWORD')
diff --git a/infrastructure-provisioning/terraform/aws/ssn-helm-charts/main/datalab-ui-chart/templates/configmap-ui-conf.yaml b/infrastructure-provisioning/terraform/aws/ssn-helm-charts/main/datalab-ui-chart/templates/configmap-ui-conf.yaml
index af0483e..5ab2abd 100644
--- a/infrastructure-provisioning/terraform/aws/ssn-helm-charts/main/datalab-ui-chart/templates/configmap-ui-conf.yaml
+++ b/infrastructure-provisioning/terraform/aws/ssn-helm-charts/main/datalab-ui-chart/templates/configmap-ui-conf.yaml
@@ -113,7 +113,7 @@ data:
<#if DEV_MODE == "true">
billingConfFile: ${sys['user.dir']}/../billing/billing.yml
<#else>
- billingConfFile: ${DLAB_CONF_DIR}/billing.yml
+ billingConfFile: ${DATALAB_CONF_DIR}/billing.yml
</#if>
<#if CLOUD_TYPE == "azure">
diff --git a/infrastructure-provisioning/terraform/bin/deploy/endpoint_fab.py b/infrastructure-provisioning/terraform/bin/deploy/endpoint_fab.py
index 41037b8..7b188ac 100644
--- a/infrastructure-provisioning/terraform/bin/deploy/endpoint_fab.py
+++ b/infrastructure-provisioning/terraform/bin/deploy/endpoint_fab.py
@@ -620,7 +620,7 @@ def start_supervisor_endpoint():
def get_sources():
try:
- conn.run("git clone https://github.com/apache/incubator-dlab.git {0}/sources".format(args.datalab_path))
+ conn.run("git clone https://github.com/apache/incubator-datalab.git {0}/sources".format(args.datalab_path))
if args.branch_name != "":
conn.run("cd {0}/sources && git checkout {1} && cd".format(args.datalab_path, args.branch_name))
except Exception as err:
diff --git a/infrastructure-provisioning/terraform/gcp/endpoint/provisioning.py b/infrastructure-provisioning/terraform/gcp/endpoint/provisioning.py
index 135f316..c513b10 100644
--- a/infrastructure-provisioning/terraform/gcp/endpoint/provisioning.py
+++ b/infrastructure-provisioning/terraform/gcp/endpoint/provisioning.py
@@ -372,7 +372,7 @@ def start_supervisor_endpoint():
def get_sources():
try:
- conn.run("git clone https://github.com/apache/incubator-dlab.git {0}/sources".format(args.datalab_path))
+ conn.run("git clone https://github.com/apache/incubator-datalab.git {0}/sources".format(args.datalab_path))
if args.branch_name != "":
conn.run("cd {0}/sources && git checkout {1} && cd".format(args.datalab_path, args.branch_name))
except Exception as err:
diff --git a/infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/datalab-ui-chart/templates/configmap-ui-conf.yaml b/infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/datalab-ui-chart/templates/configmap-ui-conf.yaml
index 446c3da..d293493 100644
--- a/infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/datalab-ui-chart/templates/configmap-ui-conf.yaml
+++ b/infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/datalab-ui-chart/templates/configmap-ui-conf.yaml
@@ -113,7 +113,7 @@ data:
<#if DEV_MODE == "true">
billingConfFile: ${sys['user.dir']}/../billing/billing.yml
<#else>
- billingConfFile: ${DLAB_CONF_DIR}/billing.yml
+ billingConfFile: ${DATALAB_CONF_DIR}/billing.yml
</#if>
<#if CLOUD_TYPE == "azure">
diff --git a/integration-tests/examples/copy_files.py b/integration-tests/examples/copy_files.py
index 3ecc17d..f96398d 100644
--- a/integration-tests/examples/copy_files.py
+++ b/integration-tests/examples/copy_files.py
@@ -99,7 +99,7 @@ if __name__ == "__main__":
if args.cloud == 'aws':
upload_aws()
elif args.cloud == 'azure':
- os.environ['AZURE_AUTH_LOCATION'] = '/home/dlab-user/keys/azure_auth.json'
+ os.environ['AZURE_AUTH_LOCATION'] = '/home/datalab-user/keys/azure_auth.json'
if args.azure_datalake_account:
upload_azure_datalake()
else:
diff --git a/integration-tests/examples/test_templates/deeplearning/template_preparation_tensor.ipynb b/integration-tests/examples/test_templates/deeplearning/template_preparation_tensor.ipynb
index 0396cb3..b1eadda 100644
--- a/integration-tests/examples/test_templates/deeplearning/template_preparation_tensor.ipynb
+++ b/integration-tests/examples/test_templates/deeplearning/template_preparation_tensor.ipynb
@@ -30,13 +30,13 @@
"metadata": {},
"outputs": [],
"source": [
- "TRAIN_DIR = '/home/dlab-user/train/'\n",
- "TEST_DIR = '/home/dlab-user/test/'\n",
+ "TRAIN_DIR = '/home/datalab-user/train/'\n",
+ "TEST_DIR = '/home/datalab-user/test/'\n",
"ROWS = 128\n",
"COLS = 128\n",
"CHANNELS = 3\n",
"TRAIN_IMAGES_COUNT = 1000\n",
- "PATH_TO_LOGS = '/home/dlab-user/logs'"
+ "PATH_TO_LOGS = '/home/datalab-user/logs'"
]
},
{
@@ -227,8 +227,8 @@
"metadata": {},
"outputs": [],
"source": [
- "path_to_model = '/home/dlab-user/model_1000.json'\n",
- "path_to_weights = '/home/dlab-user/weigths_1000.h5'\n",
+ "path_to_model = '/home/datalab-user/model_1000.json'\n",
+ "path_to_weights = '/home/datalab-user/weigths_1000.h5'\n",
"\n",
"model.save(path_to_model)\n",
"model.save_weights(path_to_weights)"
diff --git a/integration-tests/examples/test_templates/deeplearning/template_visualization_tensor.ipynb b/integration-tests/examples/test_templates/deeplearning/template_visualization_tensor.ipynb
index 92eba38..c233ab2 100644
--- a/integration-tests/examples/test_templates/deeplearning/template_visualization_tensor.ipynb
+++ b/integration-tests/examples/test_templates/deeplearning/template_visualization_tensor.ipynb
@@ -27,8 +27,8 @@
"metadata": {},
"outputs": [],
"source": [
- "path_to_model = '/home/dlab-user/model_1000.json'\n",
- "path_to_weights = '/home/dlab-user/weigths_1000.h5'"
+ "path_to_model = '/home/datalab-user/model_1000.json'\n",
+ "path_to_weights = '/home/datalab-user/weigths_1000.h5'"
]
},
{
@@ -47,7 +47,7 @@
"ROWS = 128\n",
"COLS = 128\n",
"CHANNELS = 3\n",
- "TEST_DIR = '/home/dlab-user/test/'\n",
+ "TEST_DIR = '/home/datalab-user/test/'\n",
"all_image_names = os.listdir(TEST_DIR)\n",
"all_image_names.sort()\n",
"test_images = [TEST_DIR+i for i in all_image_names[6:11] + all_image_names[19:32] + all_image_names[33:34]]\n",
diff --git a/integration-tests/examples/test_templates/tensor/template_preparation_tensor.ipynb b/integration-tests/examples/test_templates/tensor/template_preparation_tensor.ipynb
index 0396cb3..b1eadda 100644
--- a/integration-tests/examples/test_templates/tensor/template_preparation_tensor.ipynb
+++ b/integration-tests/examples/test_templates/tensor/template_preparation_tensor.ipynb
@@ -30,13 +30,13 @@
"metadata": {},
"outputs": [],
"source": [
- "TRAIN_DIR = '/home/dlab-user/train/'\n",
- "TEST_DIR = '/home/dlab-user/test/'\n",
+ "TRAIN_DIR = '/home/datalab-user/train/'\n",
+ "TEST_DIR = '/home/datalab-user/test/'\n",
"ROWS = 128\n",
"COLS = 128\n",
"CHANNELS = 3\n",
"TRAIN_IMAGES_COUNT = 1000\n",
- "PATH_TO_LOGS = '/home/dlab-user/logs'"
+ "PATH_TO_LOGS = '/home/datalab-user/logs'"
]
},
{
@@ -227,8 +227,8 @@
"metadata": {},
"outputs": [],
"source": [
- "path_to_model = '/home/dlab-user/model_1000.json'\n",
- "path_to_weights = '/home/dlab-user/weigths_1000.h5'\n",
+ "path_to_model = '/home/datalab-user/model_1000.json'\n",
+ "path_to_weights = '/home/datalab-user/weigths_1000.h5'\n",
"\n",
"model.save(path_to_model)\n",
"model.save_weights(path_to_weights)"
diff --git a/integration-tests/examples/test_templates/tensor/template_visualization_tensor.ipynb b/integration-tests/examples/test_templates/tensor/template_visualization_tensor.ipynb
index 92eba38..c233ab2 100644
--- a/integration-tests/examples/test_templates/tensor/template_visualization_tensor.ipynb
+++ b/integration-tests/examples/test_templates/tensor/template_visualization_tensor.ipynb
@@ -27,8 +27,8 @@
"metadata": {},
"outputs": [],
"source": [
- "path_to_model = '/home/dlab-user/model_1000.json'\n",
- "path_to_weights = '/home/dlab-user/weigths_1000.h5'"
+ "path_to_model = '/home/datalab-user/model_1000.json'\n",
+ "path_to_weights = '/home/datalab-user/weigths_1000.h5'"
]
},
{
@@ -47,7 +47,7 @@
"ROWS = 128\n",
"COLS = 128\n",
"CHANNELS = 3\n",
- "TEST_DIR = '/home/dlab-user/test/'\n",
+ "TEST_DIR = '/home/datalab-user/test/'\n",
"all_image_names = os.listdir(TEST_DIR)\n",
"all_image_names.sort()\n",
"test_images = [TEST_DIR+i for i in all_image_names[6:11] + all_image_names[19:32] + all_image_names[33:34]]\n",
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@datalab.apache.org
For additional commands, e-mail: commits-help@datalab.apache.org