This is an automated email from the ASF dual-hosted git repository.
lfrolov pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/incubator-datalab.git
The following commit(s) were added to refs/heads/develop by this push:
new 0a89d27 [DATALAB-2091]: added release tag as an argument with default
value to deloy_datalab.py and its usage during .jars download from the
repository
0a89d27 is described below
commit 0a89d27779f030d79b8887305603b56d51ebf767
Author: leonidfrolov <[email protected]>
AuthorDate: Tue May 11 17:24:53 2021 +0300
[DATALAB-2091]: added release tag as an argument with default value to
deloy_datalab.py and its usage during .jars download from the repository
---
infrastructure-provisioning/scripts/deploy_datalab.py | 2 ++
infrastructure-provisioning/src/general/conf/datalab.ini | 2 ++
infrastructure-provisioning/src/ssn/scripts/configure_ui.py | 12 ++++++------
3 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/infrastructure-provisioning/scripts/deploy_datalab.py
b/infrastructure-provisioning/scripts/deploy_datalab.py
index 1ea825f..7619b82 100644
--- a/infrastructure-provisioning/scripts/deploy_datalab.py
+++ b/infrastructure-provisioning/scripts/deploy_datalab.py
@@ -161,6 +161,8 @@ parser.add_argument('--conf_letsencrypt_enabled', type=str,
default='false',
help='Enable or disable Let`s Encrypt certificates')
parser.add_argument('--conf_repository_user', type=str, default='',
help='user to access repository (used for jars download)')
+parser.add_argument('--conf_release_tag', type=str, default='2.5-preview1',
+ help='tag used for jars download')
parser.add_argument('--conf_repository_pass', type=str, default='',
help='password to access repository (used for jars
download)')
parser.add_argument('--conf_repository_address', type=str, default='',
diff --git a/infrastructure-provisioning/src/general/conf/datalab.ini
b/infrastructure-provisioning/src/general/conf/datalab.ini
index b4c7d5a..685d6c6 100644
--- a/infrastructure-provisioning/src/general/conf/datalab.ini
+++ b/infrastructure-provisioning/src/general/conf/datalab.ini
@@ -93,6 +93,8 @@ private_subnet_prefix = 24
# repository_pass =
### Repository url
# repository_address =
+### release tag
+# release_tag =
### Deeplearning native cloud AMI enabled
deeplearning_cloud_ami = true
diff --git a/infrastructure-provisioning/src/ssn/scripts/configure_ui.py
b/infrastructure-provisioning/src/ssn/scripts/configure_ui.py
index 6d0c593..7a35f90 100644
--- a/infrastructure-provisioning/src/ssn/scripts/configure_ui.py
+++ b/infrastructure-provisioning/src/ssn/scripts/configure_ui.py
@@ -161,16 +161,16 @@ def build_ui():
# Building Back-end
if 'conf_repository_user' in os.environ and 'conf_repository_pass' in
os.environ and 'conf_repository_address' in os.environ:
conn.sudo(
- 'wget -P {}sources/services/provisioning-service/target/
--user={} --password={}
{}/repository/packages/provisioning-service-2.5-preview1.jar
--no-check-certificate'
- .format(args.datalab_path,
os.environ['conf_repository_user'], os.environ['conf_repository_pass'],
os.environ['conf_repository_address']))
+ 'wget -P {0}sources/services/provisioning-service/target/
--user={1} --password={2}
{3}/repository/packages/{4}/provisioning-service-{4}.jar --no-check-certificate'
+ .format(args.datalab_path,
os.environ['conf_repository_user'], os.environ['conf_repository_pass'],
os.environ['conf_repository_address'], os.environ['conf_release_tag']))
conn.sudo(
- 'wget -P {}sources/services/self-service/target/ --user={}
--password={} {}/repository/packages/self-service-2.5-preview1.jar
--no-check-certificate'
+ 'wget -P {0}sources/services/self-service/target/ --user={1}
--password={2} {3}/repository/packages/{4}/self-service-{4}.jar
--no-check-certificate'
.format(args.datalab_path, os.environ['conf_repository_user'],
os.environ['conf_repository_pass'],
- os.environ['conf_repository_address']))
+ os.environ['conf_repository_address'],
os.environ['conf_release_tag']))
conn.sudo(
- 'wget -P {0}sources/services/billing-{4}/target/ --user={1}
--password={2} {3}/repository/packages/billing-{4}-2.5-preview1.jar
--no-check-certificate'
+ 'wget -P {0}sources/services/billing-{4}/target/ --user={1}
--password={2} {3}/repository/packages/{5}/billing-{4}-{5}.jar
--no-check-certificate'
.format(args.datalab_path, os.environ['conf_repository_user'],
os.environ['conf_repository_pass'],
- os.environ['conf_repository_address'],
args.cloud_provider))
+ os.environ['conf_repository_address'],
args.cloud_provider, os.environ['conf_release_tag']))
else:
try:
conn.sudo('bash -c "cd {}sources/ && /opt/maven/bin/mvn -P{}
-DskipTests package 2>&1 > /tmp/maven.log"'.format(args.datalab_path,
args.cloud_provider))
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
