This is an automated email from the ASF dual-hosted git repository.
lfrolov pushed a commit to branch DATALAB-2320
in repository https://gitbox.apache.org/repos/asf/incubator-datalab.git
The following commit(s) were added to refs/heads/DATALAB-2320 by this push:
new 2baf805 [DATALAB-2320]: added wrong creds handling for wget
2baf805 is described below
commit 2baf805a5c9598688ca65f89dafe969c964d58b5
Author: leonidfrolov <[email protected]>
AuthorDate: Thu May 20 15:07:00 2021 +0300
[DATALAB-2320]: added wrong creds handling for wget
---
.../terraform/bin/deploy/endpoint_fab.py | 19 +++++++++++--------
1 file changed, 11 insertions(+), 8 deletions(-)
diff --git a/infrastructure-provisioning/terraform/bin/deploy/endpoint_fab.py
b/infrastructure-provisioning/terraform/bin/deploy/endpoint_fab.py
index 2d52c8e..33c5d49 100644
--- a/infrastructure-provisioning/terraform/bin/deploy/endpoint_fab.py
+++ b/infrastructure-provisioning/terraform/bin/deploy/endpoint_fab.py
@@ -589,18 +589,20 @@ def ensure_jar_endpoint():
web_path = '{}/webapp'.format(args.datalab_path)
if not exists(conn, web_path):
conn.run('mkdir -p {}'.format(web_path))
- conn.run('wget -P {} --user={} --password={} '
+ if 'Failed' in conn.run('wget -P {} --user={} --password={} '
'https://{}/repository/packages/provisioning-service-'
- '2.4.jar --no-check-certificate'
+ '2.4.jar --no-check-certificate2>&1 | tee /tmp/tee.tmp;
if grep -w -i -E "ERROR" /tmp/tee.tmp; then echo -e "==============\nFailed
jar download.\n=============="; fi'
.format(web_path, args.repository_user,
- args.repository_pass, args.repository_address))
+ args.repository_pass,
args.repository_address)).stdout:
+ sys.exit(1)
conn.run('mv {0}/provisioning-service-2.4.jar
{0}/provisioning-service.jar'
.format(web_path))
- conn.run('wget -P {} --user={} --password={} '
+ if 'Failed' in conn.run('wget -P {} --user={} --password={} '
'https://{}/repository/packages/billing-{}-'
- '2.4.jar --no-check-certificate'
+ '2.4.jar --no-check-certificate2>&1 | tee /tmp/tee.tmp;
if grep -w -i -E "ERROR" /tmp/tee.tmp; then echo -e "==============\nFailed
jar download.\n=============="; fi'
.format(web_path, args.repository_user,
- args.repository_pass, args.repository_address,
args.cloud_provider))
+ args.repository_pass, args.repository_address,
args.cloud_provider)).stdout:
+ sys.exit(1)
conn.run('mv {0}/billing-{1}-2.4.jar {0}/billing.jar'
.format(web_path, args.cloud_provider))
conn.sudo('touch {}'.format(ensure_file))
@@ -643,11 +645,12 @@ def pull_docker_images():
'azure': ['base', 'edge', 'project', 'jupyter', 'rstudio',
'zeppelin', 'tensor', 'deeplearning',
'dataengine']
}
- conn.sudo('docker login -u {} -p {} {}:{} 2>&1 | tee /tmp/tee.tmp;
if grep -w -i -E "ERROR" /tmp/tee.tmp; then echo -e "==============\nFailed
docker login.\n=============="; fi'
+ if 'Failed' in conn.sudo('docker login -u {} -p {} {}:{} 2>&1 |
tee /tmp/tee.tmp; if grep -w -i -E "ERROR" /tmp/tee.tmp; then echo -e
"==============\nFailed docker login.\n=============="; fi'
.format(args.repository_user,
args.repository_pass,
args.repository_address,
- args.repository_port))
+ args.repository_port)).stdout:
+ sys.exit(1)
for image in list_images[args.cloud_provider]:
conn.sudo('docker pull {0}:{1}/docker.datalab-{3}-{2}'
.format(args.repository_address,
args.repository_port, args.cloud_provider, image))
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
