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 55a99a2  [DLAB-11485]: [GCP] - SSN fail for test 2
55a99a2 is described below

commit 55a99a2072b561b24f87bffe983c62e051e7278a
Author: Mykola_Bodnar1 <[email protected]>
AuthorDate: Mon Mar 2 14:03:32 2020 +0200

    [DLAB-11485]: [GCP] - SSN fail for test 2
---
 .../src/general/scripts/gcp/ssn_configure.py                | 13 +------------
 1 file changed, 1 insertion(+), 12 deletions(-)

diff --git 
a/infrastructure-provisioning/src/general/scripts/gcp/ssn_configure.py 
b/infrastructure-provisioning/src/general/scripts/gcp/ssn_configure.py
index 9f51f24..0ea2c9b 100644
--- a/infrastructure-provisioning/src/general/scripts/gcp/ssn_configure.py
+++ b/infrastructure-provisioning/src/general/scripts/gcp/ssn_configure.py
@@ -58,8 +58,6 @@ if __name__ == "__main__":
         ssn_conf['region'] = os.environ['gcp_region']
         ssn_conf['zone'] = os.environ['gcp_zone']
         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']
         try:
@@ -111,7 +109,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['shared_bucket_name'])
         if not pre_defined_firewall:
             GCPActions().remove_firewall(ssn_conf['firewall_name'] + 
'-ingress')
             GCPActions().remove_firewall(ssn_conf['firewall_name'] + '-egress')
@@ -151,7 +148,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['shared_bucket_name'])
         if not pre_defined_firewall:
             GCPActions().remove_firewall(ssn_conf['firewall_name'] + 
'-ingress')
             GCPActions().remove_firewall(ssn_conf['firewall_name'] + '-egress')
@@ -172,6 +168,7 @@ if __name__ == "__main__":
 
         try:
             local("~/scripts/{}.py {}".format('install_prerequisites', params))
+            local("~/scripts/{}.py {}".format('install_prerequisites'))
         except:
             traceback.print_exc()
             raise Exception
@@ -181,7 +178,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['shared_bucket_name'])
         if not pre_defined_firewall:
             GCPActions().remove_firewall(ssn_conf['firewall_name'] + 
'-ingress')
             GCPActions().remove_firewall(ssn_conf['firewall_name'] + '-egress')
@@ -215,7 +211,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['shared_bucket_name'])
         if not pre_defined_firewall:
             GCPActions().remove_firewall(ssn_conf['firewall_name'] + 
'-ingress')
             GCPActions().remove_firewall(ssn_conf['firewall_name'] + '-egress')
@@ -257,7 +252,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['shared_bucket_name'])
         if not pre_defined_firewall:
             GCPActions().remove_firewall(ssn_conf['firewall_name'] + 
'-ingress')
             GCPActions().remove_firewall(ssn_conf['firewall_name'] + '-egress')
@@ -485,7 +479,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['shared_bucket_name'])
         if not pre_defined_firewall:
             GCPActions().remove_firewall(ssn_conf['firewall_name'] + 
'-ingress')
             GCPActions().remove_firewall(ssn_conf['firewall_name'] + '-egress')
@@ -508,7 +501,6 @@ 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("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)
@@ -534,7 +526,6 @@ if __name__ == "__main__":
                    "subnet_id": ssn_conf['subnet_name'],
                    "security_id": ssn_conf['firewall_name'],
                    "instance_shape": ssn_conf['instance_size'],
-                   "shared_bucket_name": ssn_conf['shared_bucket_name'],
                    "region": ssn_conf['region'],
                    "action": "Create SSN instance"}
             f.write(json.dumps(res))
@@ -543,13 +534,11 @@ 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['shared_bucket_name'])
         if not pre_defined_firewall:
             GCPActions().remove_firewall(ssn_conf['firewall_name'] + 
'-ingress')
             GCPActions().remove_firewall(ssn_conf['firewall_name'] + '-egress')


---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to