diff --git a/testing/citest/spinnaker_testing/google_scenario_support.py b/testing/citest/spinnaker_testing/google_scenario_support.py index 2d9ff663..33f95aee 100644 --- a/testing/citest/spinnaker_testing/google_scenario_support.py +++ b/testing/citest/spinnaker_testing/google_scenario_support.py @@ -108,7 +108,7 @@ def add_commandline_parameters(cls, scenario_class, builder, defaults): builder.add_argument( '--test_gce_image_name', default=defaults.get('TEST_GCE_IMAGE_NAME', - 'citest-boot-image'), + 'apache-base-image'), help='Default Google Compute Engine image name to use when' ' creating test instances.') diff --git a/testing/citest/tests/bake_and_deploy_test.py b/testing/citest/tests/bake_and_deploy_test.py index 45f15413..cf539515 100644 --- a/testing/citest/tests/bake_and_deploy_test.py +++ b/testing/citest/tests/bake_and_deploy_test.py @@ -371,8 +371,6 @@ def make_deploy_google_stage(self, requisiteStages=None): 'zone': self.bindings['TEST_GCE_ZONE'], 'network': 'default', 'instanceMetadata': { - 'startup-script': - 'sudo apt-get update && sudo apt-get install apache2 -y', 'load-balancer-names': self.__full_lb_name }, 'tags': [], diff --git a/testing/citest/tests/google_http_lb_upsert_scenario.py b/testing/citest/tests/google_http_lb_upsert_scenario.py index 86d43ca3..25b7fe6e 100644 --- a/testing/citest/tests/google_http_lb_upsert_scenario.py +++ b/testing/citest/tests/google_http_lb_upsert_scenario.py @@ -634,8 +634,6 @@ def add_server_group(self): bindings['TEST_GCE_REGION']: [bindings['TEST_GCE_ZONE']] }, 'instanceMetadata': { - 'startup-script': ('sudo apt-get update' - ' && sudo apt-get install apache2 -y'), 'global-load-balancer-names': self.__lb_name, 'backend-service-names': 'bs-' + self.TEST_APP, 'load-balancing-policy': json.dumps(policy) diff --git a/testing/citest/tests/google_smoke_test.py b/testing/citest/tests/google_smoke_test.py index a4a3813d..3a257706 100644 --- a/testing/citest/tests/google_smoke_test.py +++ b/testing/citest/tests/google_smoke_test.py @@ -283,8 +283,6 @@ def create_server_group(self): bindings['TEST_GCE_REGION']: [bindings['TEST_GCE_ZONE']] }, 'instanceMetadata': { - 'startup-script': ('sudo apt-get update' - ' && sudo apt-get install apache2 -y'), 'load-balancer-names': self.__lb_name }, 'account': bindings['SPINNAKER_GOOGLE_ACCOUNT'],