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 2021/05/05 14:39:58 UTC
[incubator-datalab] branch DATALAB-2091 updated (ca9ba59 -> 6641361)
This is an automated email from the ASF dual-hosted git repository.
lfrolov pushed a change to branch DATALAB-2091
in repository https://gitbox.apache.org/repos/asf/incubator-datalab.git.
from ca9ba59 [DATALAB-2391]: added version variable definition in case of invalid version
new eb69af1 [DATALAB-2386]: added jars download from the repository instead of build
new 6641361 [DATALAB-2386]: added repository parameters in deploy datalab
The 2 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.
Summary of changes:
.../scripts/deploy_datalab.py | 6 +++++
.../src/general/conf/datalab.ini | 6 ++---
.../src/ssn/scripts/configure_ui.py | 27 ++++++++++++++++------
3 files changed, 29 insertions(+), 10 deletions(-)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@datalab.apache.org
For additional commands, e-mail: commits-help@datalab.apache.org
[incubator-datalab] 01/02: [DATALAB-2386]: added jars download from
the repository instead of build
Posted by lf...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
lfrolov pushed a commit to branch DATALAB-2091
in repository https://gitbox.apache.org/repos/asf/incubator-datalab.git
commit eb69af14e45a06bb541ff16ea6285fe7f34aa63f
Author: leonidfrolov <fr...@gmail.com>
AuthorDate: Wed May 5 17:25:46 2021 +0300
[DATALAB-2386]: added jars download from the repository instead of build
---
.../src/ssn/scripts/configure_ui.py | 27 ++++++++++++++++------
1 file changed, 20 insertions(+), 7 deletions(-)
diff --git a/infrastructure-provisioning/src/ssn/scripts/configure_ui.py b/infrastructure-provisioning/src/ssn/scripts/configure_ui.py
index 5415491..d7e1ca5 100644
--- a/infrastructure-provisioning/src/ssn/scripts/configure_ui.py
+++ b/infrastructure-provisioning/src/ssn/scripts/configure_ui.py
@@ -159,13 +159,26 @@ def build_ui():
conn.sudo('sudo chown -R {} {}/*'.format(args.os_user, args.datalab_path))
# Building Back-end
- 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))
- except:
- conn.run('if ! grep -w -E "(ERROR)" /tmp/maven.log > /tmp/maven_error.log; then echo "no_error" > /tmp/maven_error.log;fi')
- conn.run('cat /tmp/maven_error.log')
- print('Failed to build Back-end: ', str(err))
- sys.exit(1)
+ if 'repository_user' in os.environ and 'repository_pass' in os.environ and 'repository_address' in os.environ:
+ conn.sudo(
+ 'wget -P {}sources/services/provisioning-service/target/ --user={} --password={} https://{}/repository/packages/provisioning-service-2.4.jar --no-check-certificate'
+ .format(args.datalab_path, os.environ['repository_user'], os.environ['repository_pass'], os.environ['repository_address']))
+ conn.sudo(
+ 'wget -P {}sources/services/self-service/target/ --user={} --password={} https://{}/repository/packages/self-service-2.4.jar --no-check-certificate'
+ .format(args.datalab_path, os.environ['repository_user'], os.environ['repository_pass'],
+ os.environ['repository_address']))
+ conn.sudo(
+ 'wget -P {0}sources/services/billing-{4}/target/ --user={1} --password={2} https://{3}/repository/packages/billing-{4}-2.4.jar --no-check-certificate'
+ .format(args.datalab_path, os.environ['repository_user'], os.environ['repository_pass'],
+ os.environ['repository_address'], args.cloud_provider))
+ 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))
+ except:
+ conn.run('if ! grep -w -E "(ERROR)" /tmp/maven.log > /tmp/maven_error.log; then echo "no_error" > /tmp/maven_error.log;fi')
+ conn.run('cat /tmp/maven_error.log')
+ print('Failed to build Back-end: ', str(err))
+ sys.exit(1)
conn.sudo('mkdir -p {}webapp/'.format(args.datalab_path))
for service in ['self-service', 'provisioning-service', 'billing']:
conn.sudo('mkdir -p {}webapp/{}/lib/'.format(args.datalab_path, service))
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@datalab.apache.org
For additional commands, e-mail: commits-help@datalab.apache.org
[incubator-datalab] 02/02: [DATALAB-2386]: added repository
parameters in deploy datalab
Posted by lf...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
lfrolov pushed a commit to branch DATALAB-2091
in repository https://gitbox.apache.org/repos/asf/incubator-datalab.git
commit 6641361c607868dc8cd30ac5793be185a9cbbea5
Author: leonidfrolov <fr...@gmail.com>
AuthorDate: Wed May 5 17:39:00 2021 +0300
[DATALAB-2386]: added repository parameters in deploy datalab
---
infrastructure-provisioning/scripts/deploy_datalab.py | 6 ++++++
infrastructure-provisioning/src/general/conf/datalab.ini | 6 +++---
2 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/infrastructure-provisioning/scripts/deploy_datalab.py b/infrastructure-provisioning/scripts/deploy_datalab.py
index d1096d4..1ea825f 100644
--- a/infrastructure-provisioning/scripts/deploy_datalab.py
+++ b/infrastructure-provisioning/scripts/deploy_datalab.py
@@ -159,6 +159,12 @@ parser.add_argument('--conf_stepcerts_kid_password', type=str, default='', help=
parser.add_argument('--conf_stepcerts_ca_url', type=str, default='', help='Step CA URL')
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_repository_pass', type=str, default='',
+ help='password to access repository (used for jars download)')
+parser.add_argument('--conf_repository_address', type=str, default='',
+ help='address to access repository (used for jars download)')
parser.add_argument('--conf_letsencrypt_domain_name', type=str, default='', help='Domain names to apply. '
'For multiple domains enter a comma separated list of domains as a parameter'
'ssn.domain_name will be used for ssn_node, DNS A record have to exist during deployment')
diff --git a/infrastructure-provisioning/src/general/conf/datalab.ini b/infrastructure-provisioning/src/general/conf/datalab.ini
index 085561c..334a618 100644
--- a/infrastructure-provisioning/src/general/conf/datalab.ini
+++ b/infrastructure-provisioning/src/general/conf/datalab.ini
@@ -86,11 +86,11 @@ letsencrypt_enabled = false
### Prefix of the private subnet
private_subnet_prefix = 24
### Repository user
-repository_user =
+# repository_user =
### Repository password
-repository_pass =
+# repository_pass =
### Repository url
-repository_address =
+# repository_address =
### Deeplearning native cloud AMI enabled
deeplearning_cloud_ami = true
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@datalab.apache.org
For additional commands, e-mail: commits-help@datalab.apache.org