You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dlab.apache.org by my...@apache.org on 2020/03/02 10:57:19 UTC
[incubator-dlab] branch DLAB-1485 updated: [DLAB-11485]: [GCP] -
SSN fail for test 1
This is an automated email from the ASF dual-hosted git repository.
mykolabodnar pushed a commit to branch DLAB-1485
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
The following commit(s) were added to refs/heads/DLAB-1485 by this push:
new 01780c1 [DLAB-11485]: [GCP] - SSN fail for test 1
01780c1 is described below
commit 01780c1d7e15bfdb692c36abb25f1b506e12befb
Author: Mykola_Bodnar1 <bo...@gmail.com>
AuthorDate: Mon Mar 2 12:56:53 2020 +0200
[DLAB-11485]: [GCP] - SSN fail for test 1
---
.../src/general/scripts/gcp/ssn_configure.py | 12 ++----------
.../src/general/scripts/gcp/ssn_prepare.py | 10 +---------
2 files changed, 3 insertions(+), 19 deletions(-)
diff --git a/infrastructure-provisioning/src/general/scripts/gcp/ssn_configure.py b/infrastructure-provisioning/src/general/scripts/gcp/ssn_configure.py
index 146e84d..9f51f24 100644
--- a/infrastructure-provisioning/src/general/scripts/gcp/ssn_configure.py
+++ b/infrastructure-provisioning/src/general/scripts/gcp/ssn_configure.py
@@ -57,7 +57,6 @@ if __name__ == "__main__":
os.environ['conf_service_base_name'].lower().replace('_', '-')[:12], '-', True)
ssn_conf['region'] = os.environ['gcp_region']
ssn_conf['zone'] = os.environ['gcp_zone']
- ssn_conf['ssn_bucket_name'] = '{}-ssn-bucket'.format(ssn_conf['service_base_name'])
ssn_conf['default_endpoint_name'] = os.environ['default_endpoint_name']
ssn_conf['shared_bucket_name'] = '{0}-{1}-shared-bucket'.format(ssn_conf['service_base_name'],
ssn_conf['default_endpoint_name'])
@@ -112,7 +111,6 @@ if __name__ == "__main__":
GCPActions().remove_instance(ssn_conf['instance_name'], ssn_conf['zone'])
GCPActions().remove_service_account(ssn_conf['service_account_name'], ssn_conf['service_base_name'])
GCPActions().remove_role(ssn_conf['role_name'])
- GCPActions().remove_bucket(ssn_conf['ssn_bucket_name'])
GCPActions().remove_bucket(ssn_conf['shared_bucket_name'])
if not pre_defined_firewall:
GCPActions().remove_firewall(ssn_conf['firewall_name'] + '-ingress')
@@ -153,7 +151,6 @@ if __name__ == "__main__":
GCPActions().remove_instance(ssn_conf['instance_name'], ssn_conf['zone'])
GCPActions().remove_service_account(ssn_conf['service_account_name'], ssn_conf['service_base_name'])
GCPActions().remove_role(ssn_conf['role_name'])
- GCPActions().remove_bucket(ssn_conf['ssn_bucket_name'])
GCPActions().remove_bucket(ssn_conf['shared_bucket_name'])
if not pre_defined_firewall:
GCPActions().remove_firewall(ssn_conf['firewall_name'] + '-ingress')
@@ -184,7 +181,6 @@ if __name__ == "__main__":
GCPActions().remove_instance(ssn_conf['instance_name'], ssn_conf['zone'])
GCPActions().remove_service_account(ssn_conf['service_account_name'], ssn_conf['service_base_name'])
GCPActions().remove_role(ssn_conf['role_name'])
- GCPActions().remove_bucket(ssn_conf['ssn_bucket_name'])
GCPActions().remove_bucket(ssn_conf['shared_bucket_name'])
if not pre_defined_firewall:
GCPActions().remove_firewall(ssn_conf['firewall_name'] + '-ingress')
@@ -219,7 +215,6 @@ if __name__ == "__main__":
GCPActions().remove_instance(ssn_conf['instance_name'], ssn_conf['zone'])
GCPActions().remove_service_account(ssn_conf['service_account_name'], ssn_conf['service_base_name'])
GCPActions().remove_role(ssn_conf['role_name'])
- GCPActions().remove_bucket(ssn_conf['ssn_bucket_name'])
GCPActions().remove_bucket(ssn_conf['shared_bucket_name'])
if not pre_defined_firewall:
GCPActions().remove_firewall(ssn_conf['firewall_name'] + '-ingress')
@@ -262,7 +257,6 @@ if __name__ == "__main__":
GCPActions().remove_instance(ssn_conf['instance_name'], ssn_conf['zone'])
GCPActions().remove_service_account(ssn_conf['service_account_name'], ssn_conf['service_base_name'])
GCPActions().remove_role(ssn_conf['role_name'])
- GCPActions().remove_bucket(ssn_conf['ssn_bucket_name'])
GCPActions().remove_bucket(ssn_conf['shared_bucket_name'])
if not pre_defined_firewall:
GCPActions().remove_firewall(ssn_conf['firewall_name'] + '-ingress')
@@ -491,7 +485,6 @@ if __name__ == "__main__":
GCPActions().remove_instance(ssn_conf['instance_name'], ssn_conf['zone'])
GCPActions().remove_service_account(ssn_conf['service_account_name'], ssn_conf['service_base_name'])
GCPActions().remove_role(ssn_conf['role_name'])
- GCPActions().remove_bucket(ssn_conf['ssn_bucket_name'])
GCPActions().remove_bucket(ssn_conf['shared_bucket_name'])
if not pre_defined_firewall:
GCPActions().remove_firewall(ssn_conf['firewall_name'] + '-ingress')
@@ -515,7 +508,7 @@ if __name__ == "__main__":
print("Firewall Names: {}".format(ssn_conf['firewall_name']))
print("SSN instance size: {}".format(ssn_conf['instance_size']))
print("SSN AMI name: {}".format(ssn_conf['image_name']))
- print("SSN bucket name: {}".format(ssn_conf['ssn_bucket_name']))
+ print("Shared bucket name: {}".format(ssn_conf['shared_bucket_name']))
print("Region: {}".format(ssn_conf['region']))
jenkins_url = "http://{}/jenkins".format(instance_hostname)
jenkins_url_https = "https://{}/jenkins".format(instance_hostname)
@@ -541,7 +534,6 @@ if __name__ == "__main__":
"subnet_id": ssn_conf['subnet_name'],
"security_id": ssn_conf['firewall_name'],
"instance_shape": ssn_conf['instance_size'],
- "bucket_name": ssn_conf['ssn_bucket_name'],
"shared_bucket_name": ssn_conf['shared_bucket_name'],
"region": ssn_conf['region'],
"action": "Create SSN instance"}
@@ -551,12 +543,12 @@ if __name__ == "__main__":
params = "--instance_name {} --local_log_filepath {} --os_user {} --instance_hostname {}".\
format(ssn_conf['instance_name'], local_log_filepath, ssn_conf['dlab_ssh_user'], instance_hostname)
local("~/scripts/{}.py {}".format('upload_response_file', params))
+ local("~/scripts/{}.py {}".format('upload_response_file'))
except Exception as err:
print('Error: {0}'.format(err))
GCPActions().remove_instance(ssn_conf['instance_name'], ssn_conf['zone'])
GCPActions().remove_service_account(ssn_conf['service_account_name'], ssn_conf['service_base_name'])
GCPActions().remove_role(ssn_conf['role_name'])
- GCPActions().remove_bucket(ssn_conf['ssn_bucket_name'])
GCPActions().remove_bucket(ssn_conf['shared_bucket_name'])
if not pre_defined_firewall:
GCPActions().remove_firewall(ssn_conf['firewall_name'] + '-ingress')
diff --git a/infrastructure-provisioning/src/general/scripts/gcp/ssn_prepare.py b/infrastructure-provisioning/src/general/scripts/gcp/ssn_prepare.py
index 3af1e11..7e77238 100644
--- a/infrastructure-provisioning/src/general/scripts/gcp/ssn_prepare.py
+++ b/infrastructure-provisioning/src/general/scripts/gcp/ssn_prepare.py
@@ -52,10 +52,7 @@ if __name__ == "__main__":
os.environ['conf_service_base_name'].lower().replace('_', '-')[:12], '-', True)
ssn_conf['region'] = os.environ['gcp_region']
ssn_conf['zone'] = os.environ['gcp_zone']
- ssn_conf['ssn_bucket_name'] = '{}-ssn-bucket'.format(ssn_conf['service_base_name'])
ssn_conf['default_endpoint_name'] = os.environ['default_endpoint_name']
- ssn_conf['shared_bucket_name'] = '{0}-{1}-shared-bucket'.format(ssn_conf['service_base_name'],
- ssn_conf['default_endpoint_name'])
ssn_conf['instance_name'] = '{}-ssn'.format(ssn_conf['service_base_name'])
ssn_conf['instance_size'] = os.environ['gcp_ssn_instance_size']
ssn_conf['vpc_name'] = '{}-ssn-vpc'.format(ssn_conf['service_base_name'])
@@ -245,8 +242,6 @@ if __name__ == "__main__":
print("Static IP address hasn't been created.")
GCPActions().remove_service_account(ssn_conf['service_account_name'], ssn_conf['service_base_name'])
GCPActions().remove_role(ssn_conf['role_name'])
- GCPActions().remove_bucket(ssn_conf['ssn_bucket_name'])
- GCPActions().remove_bucket(ssn_conf['shared_bucket_name'])
if not pre_defined_firewall:
GCPActions().remove_firewall(ssn_conf['firewall_name'] + '-ingress')
GCPActions().remove_firewall(ssn_conf['firewall_name'] + '-egress')
@@ -277,7 +272,6 @@ if __name__ == "__main__":
ssn_conf['network_tag'], json.dumps(ssn_conf['instance_labels']), '20', ssn_conf['service_base_name'])
try:
local("~/scripts/{}.py {}".format('common_create_instance', params))
- local("~/scripts/{}.py {}".format('common_create_instance'))
except:
traceback.print_exc()
raise Exception
@@ -287,9 +281,7 @@ if __name__ == "__main__":
GCPActions().remove_service_account(ssn_conf['service_account_name'], ssn_conf['service_base_name'])
GCPActions().remove_role(ssn_conf['role_name'])
GCPActions().remove_static_address(ssn_conf['static_address_name'], ssn_conf['region'])
- GCPActions().remove_bucket(ssn_conf['ssn_bucket_name'])
- GCPActions().remove_bucket(ssn_conf['shared_bucket_name'])
- if not pre_defined_firewall:
+ if not pre_defined_firewall:
GCPActions().remove_firewall(ssn_conf['firewall_name'] + '-ingress')
GCPActions().remove_firewall(ssn_conf['firewall_name'] + '-egress')
if not pre_defined_subnet:
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org