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/06 10:02:14 UTC
[incubator-datalab] branch DATALAB-2386 updated (0604988 -> 9e7520d)
This is an automated email from the ASF dual-hosted git repository.
lfrolov pushed a change to branch DATALAB-2386
in repository https://gitbox.apache.org/repos/asf/incubator-datalab.git.
from 0604988 [DATALAB-2386]: removed additional output during mvn package
new d081428 [DATALAB-2386]: added jars download
new 69d4c5c [DATALAB-2386]: added repository arguments
new 9e7520d [DATALAB-2386]: fixed variables names and repository link
The 3 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:
infrastructure-provisioning/scripts/deploy_datalab.py | 6 ++++++
.../src/general/conf/datalab.ini | 6 ++++++
infrastructure-provisioning/src/general/lib/os/fab.py | 1 +
.../src/ssn/scripts/configure_ui.py | 17 +++++++++++++++--
4 files changed, 28 insertions(+), 2 deletions(-)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@datalab.apache.org
For additional commands, e-mail: commits-help@datalab.apache.org
[incubator-datalab] 02/03: [DATALAB-2386]: added repository
arguments
Posted by lf...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
lfrolov pushed a commit to branch DATALAB-2386
in repository https://gitbox.apache.org/repos/asf/incubator-datalab.git
commit 69d4c5c49cc0f1fa8835b6b0677dbf4424ced673
Author: leonidfrolov <fr...@gmail.com>
AuthorDate: Wed May 5 17:39:00 2021 +0300
[DATALAB-2386]: added repository arguments
---
infrastructure-provisioning/scripts/deploy_datalab.py | 6 ++++++
infrastructure-provisioning/src/general/conf/datalab.ini | 6 ++++++
2 files changed, 12 insertions(+)
diff --git a/infrastructure-provisioning/scripts/deploy_datalab.py b/infrastructure-provisioning/scripts/deploy_datalab.py
index 530f19b..883663c 100644
--- a/infrastructure-provisioning/scripts/deploy_datalab.py
+++ b/infrastructure-provisioning/scripts/deploy_datalab.py
@@ -157,6 +157,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 8cd67a8..979ea5a 100644
--- a/infrastructure-provisioning/src/general/conf/datalab.ini
+++ b/infrastructure-provisioning/src/general/conf/datalab.ini
@@ -87,6 +87,12 @@ letsencrypt_enabled = false
private_subnet_prefix = 24
### Range of subnets defined by user
# user_subnets_range = 172.31.0.0/24 - 172.31.50.0/24
+### Repository user
+# repository_user =
+### Repository password
+# repository_pass =
+### Repository url
+# repository_address =
#--- [aws] section contains all common parameters related to Amazon ---#
[aws]
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@datalab.apache.org
For additional commands, e-mail: commits-help@datalab.apache.org
[incubator-datalab] 01/03: [DATALAB-2386]: added jars download
Posted by lf...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
lfrolov pushed a commit to branch DATALAB-2386
in repository https://gitbox.apache.org/repos/asf/incubator-datalab.git
commit d08142827be6698c3e758405d43812fec96efdc8
Author: leonidfrolov <fr...@gmail.com>
AuthorDate: Wed May 5 17:25:46 2021 +0300
[DATALAB-2386]: added jars download
---
.../src/ssn/scripts/configure_ui.py | 17 +++++++++++++++--
1 file changed, 15 insertions(+), 2 deletions(-)
diff --git a/infrastructure-provisioning/src/ssn/scripts/configure_ui.py b/infrastructure-provisioning/src/ssn/scripts/configure_ui.py
index fce5306..1785afd 100644
--- a/infrastructure-provisioning/src/ssn/scripts/configure_ui.py
+++ b/infrastructure-provisioning/src/ssn/scripts/configure_ui.py
@@ -157,8 +157,21 @@ def build_ui():
sudo('sudo chown -R {} {}/*'.format(args.os_user, args.datalab_path))
# Building Back-end
- with cd(args.datalab_path + '/sources/'):
- sudo('/opt/maven/bin/mvn -P{} -DskipTests package'.format(args.cloud_provider))
+ if 'repository_user' in os.environ and 'repository_pass' in os.environ and 'repository_address' in os.environ:
+ 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']))
+ 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']))
+ 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:
+ with cd(args.datalab_path + '/sources/'):
+ sudo('/opt/maven/bin/mvn -P{} -DskipTests package'.format(args.cloud_provider))
sudo('mkdir -p {}/webapp/'.format(args.datalab_path))
for service in ['self-service', 'provisioning-service', 'billing']:
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@datalab.apache.org
For additional commands, e-mail: commits-help@datalab.apache.org
[incubator-datalab] 03/03: [DATALAB-2386]: fixed variables names
and repository link
Posted by lf...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
lfrolov pushed a commit to branch DATALAB-2386
in repository https://gitbox.apache.org/repos/asf/incubator-datalab.git
commit 9e7520da8c646b9d1f91b53019e2af85144a40dd
Author: leonidfrolov <fr...@gmail.com>
AuthorDate: Wed May 5 17:52:03 2021 +0300
[DATALAB-2386]: fixed variables names and repository link
---
infrastructure-provisioning/src/general/lib/os/fab.py | 1 +
infrastructure-provisioning/src/ssn/scripts/configure_ui.py | 12 ++++++------
2 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/infrastructure-provisioning/src/general/lib/os/fab.py b/infrastructure-provisioning/src/general/lib/os/fab.py
index 0d99831..a633872 100644
--- a/infrastructure-provisioning/src/general/lib/os/fab.py
+++ b/infrastructure-provisioning/src/general/lib/os/fab.py
@@ -745,6 +745,7 @@ def configure_data_engine_service_pip(hostname, os_user, keyfile, emr=False):
elif not exists('/usr/bin/pip3') and sudo("python3.7 -V 2>/dev/null | awk '{print $2}'"):
sudo('ln -s /usr/bin/pip-3.7 /usr/bin/pip3')
if emr:
+<<<<<<< HEAD
sudo('pip3 install -U pip=={}'.format(os.environ['conf_pip_version']))
sudo('pip2 install -U pip=={}'.format(os.environ['conf_pip_version']))
sudo('ln -s /usr/local/bin/pip3.7 /bin/pip3.7')
diff --git a/infrastructure-provisioning/src/ssn/scripts/configure_ui.py b/infrastructure-provisioning/src/ssn/scripts/configure_ui.py
index 1785afd..b74f4a7 100644
--- a/infrastructure-provisioning/src/ssn/scripts/configure_ui.py
+++ b/infrastructure-provisioning/src/ssn/scripts/configure_ui.py
@@ -157,18 +157,18 @@ def build_ui():
sudo('sudo chown -R {} {}/*'.format(args.os_user, args.datalab_path))
# Building Back-end
- if 'repository_user' in os.environ and 'repository_pass' in os.environ and 'repository_address' in os.environ:
+ if 'conf_repository_user' in os.environ and 'conf_repository_pass' in os.environ and 'conf_repository_address' in os.environ:
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']))
+ .format(args.datalab_path, os.environ['conf_repository_user'], os.environ['conf_repository_pass'], os.environ['conf_repository_address']))
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']))
+ .format(args.datalab_path, os.environ['conf_repository_user'], os.environ['conf_repository_pass'],
+ os.environ['conf_repository_address']))
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))
+ .format(args.datalab_path, os.environ['conf_repository_user'], os.environ['conf_repository_pass'],
+ os.environ['conf_repository_address'], args.cloud_provider))
else:
with cd(args.datalab_path + '/sources/'):
sudo('/opt/maven/bin/mvn -P{} -DskipTests package'.format(args.cloud_provider))
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@datalab.apache.org
For additional commands, e-mail: commits-help@datalab.apache.org