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 <[email protected]> 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: [email protected] For additional commands, e-mail: [email protected]
