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 558008f [DATALAB-2320]: added error parsing
558008f is described below
commit 558008f374f8ff38fea3d579f93a58554cfb67ae
Author: leonidfrolov <[email protected]>
AuthorDate: Thu May 20 15:17:15 2021 +0300
[DATALAB-2320]: added error parsing
---
infrastructure-provisioning/terraform/bin/deploy/endpoint_fab.py | 4 ++--
infrastructure-provisioning/terraform/gcp/endpoint/provisioning.py | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/infrastructure-provisioning/terraform/bin/deploy/endpoint_fab.py
b/infrastructure-provisioning/terraform/bin/deploy/endpoint_fab.py
index d19639d..1082050 100644
--- a/infrastructure-provisioning/terraform/bin/deploy/endpoint_fab.py
+++ b/infrastructure-provisioning/terraform/bin/deploy/endpoint_fab.py
@@ -591,7 +591,7 @@ def ensure_jar_endpoint():
conn.run('mkdir -p {}'.format(web_path))
if 'Failed' in conn.run('wget -P {} --user={} --password={} '
'https://{}/repository/packages/provisioning-service-'
- '2.4.jar --no-check-certificate 2>&1 | tee /tmp/tee.tmp;
if grep -w -i -E "ERROR" /tmp/tee.tmp; then echo -e "==============\nFailed
jar download.\n=============="; fi'
+ '2.4.jar --no-check-certificate 2>&1 | tee /tmp/tee.tmp;
if grep -w -i -E "ERROR|Failed" /tmp/tee.tmp; then echo -e
"==============\nFailed jar download.\n=============="; fi'
.format(web_path, args.repository_user,
args.repository_pass,
args.repository_address)).stdout:
sys.exit(1)
@@ -599,7 +599,7 @@ def ensure_jar_endpoint():
.format(web_path))
if 'Failed' in conn.run('wget -P {} --user={} --password={} '
'https://{}/repository/packages/billing-{}-'
- '2.4.jar --no-check-certificate 2>&1 | tee /tmp/tee.tmp;
if grep -w -i -E "ERROR" /tmp/tee.tmp; then echo -e "==============\nFailed
jar download.\n=============="; fi'
+ '2.4.jar --no-check-certificate 2>&1 | tee /tmp/tee.tmp;
if grep -w -i -E "ERROR|Failed" /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)).stdout:
sys.exit(1)
diff --git a/infrastructure-provisioning/terraform/gcp/endpoint/provisioning.py
b/infrastructure-provisioning/terraform/gcp/endpoint/provisioning.py
index 2ec669d..ed83bb6 100644
--- a/infrastructure-provisioning/terraform/gcp/endpoint/provisioning.py
+++ b/infrastructure-provisioning/terraform/gcp/endpoint/provisioning.py
@@ -344,14 +344,14 @@ def ensure_jar_endpoint():
if args.cloud_provider == "aws":
if 'Failed' in conn.run('wget -P {} --user={} --password={} '
'https://{}/repository/packages/aws/provisioning-service-'
- '2.1.jar --no-check-certificate 2>&1 | tee
/tmp/tee.tmp; if grep -w -i -E "ERROR" /tmp/tee.tmp; then echo -e
"==============\nFailed jar download.\n=============="; fi'
+ '2.1.jar --no-check-certificate 2>&1 | tee
/tmp/tee.tmp; if grep -w -i -E "ERROR|Failed" /tmp/tee.tmp; then echo -e
"==============\nFailed jar download.\n=============="; fi'
.format(web_path, args.repository_user,
args.repository_pass,
args.repository_address)).stdout:
sys.exit(1)
elif args.cloud_provider == "gcp":
if 'Failed' in conn.run('wget -P {} --user={} --password={} '
'https://{}/repository/packages/gcp/provisioning-service-'
- '2.1.jar --no-check-certificate 2>&1 | tee
/tmp/tee.tmp; if grep -w -i -E "ERROR" /tmp/tee.tmp; then echo -e
"==============\nFailed jar download.\n=============="; fi'
+ '2.1.jar --no-check-certificate 2>&1 | tee
/tmp/tee.tmp; if grep -w -i -E "ERROR|Failed" /tmp/tee.tmp; then echo -e
"==============\nFailed jar download.\n=============="; fi'
.format(web_path, args.repository_user,
args.repository_pass,
args.repository_address)).stdout:
sys.exit(1)
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
