Stop using [orchestration] image_ref
There are no remaining heat tests which require heat-cfntools on the test image, so orchestration tests can just use [compute] image_ref (AKA cirros). test_neutron_resources has been modified to use curl instead of cfn-signal. This will close tempest bugs where fedora boot times out in general gate jobs. Change-Id: Ic70c4b5859183b9ebc716dec3095cefc62be5af7 Closes-Bug: #1430524
This commit is contained in:
parent
0a95854a8d
commit
5b242fdb88
@ -905,10 +905,6 @@
|
||||
# the test workload (string value)
|
||||
#instance_type = m1.micro
|
||||
|
||||
# Name of heat-cfntools enabled image to use when launching test
|
||||
# instances. (string value)
|
||||
#image_ref = <None>
|
||||
|
||||
# Name of existing keypair to launch servers with. (string value)
|
||||
#keypair_name = <None>
|
||||
|
||||
|
@ -51,12 +51,14 @@ resources:
|
||||
key_name: {get_param: KeyName}
|
||||
networks:
|
||||
- network: {get_resource: Network}
|
||||
user_data_format: RAW
|
||||
user_data:
|
||||
str_replace:
|
||||
template: |
|
||||
#!/bin/bash -v
|
||||
#!/bin/sh -v
|
||||
|
||||
while ! /opt/aws/bin/cfn-signal -e 0 -r "SmokeServerNeutron created" \
|
||||
SIGNAL_DATA='{"Status": "SUCCESS", "Reason": "SmokeServerNeutron created", "Data": "Application has completed configuration.", "UniqueId": "00000"}'
|
||||
while ! curl --fail -X PUT -H 'Content-Type:' --data-binary "$SIGNAL_DATA" \
|
||||
'wait_handle' ; do sleep 3; done
|
||||
params:
|
||||
wait_handle: {get_resource: WaitHandleNeutron}
|
||||
|
@ -32,8 +32,6 @@ class NeutronResourcesTestJSON(base.BaseOrchestrationTest):
|
||||
@classmethod
|
||||
def skip_checks(cls):
|
||||
super(NeutronResourcesTestJSON, cls).skip_checks()
|
||||
if not CONF.orchestration.image_ref:
|
||||
raise cls.skipException("No image available to test")
|
||||
if not CONF.service_available.neutron:
|
||||
raise cls.skipException("Neutron support is required")
|
||||
|
||||
@ -68,7 +66,7 @@ class NeutronResourcesTestJSON(base.BaseOrchestrationTest):
|
||||
parameters={
|
||||
'KeyName': cls.keypair_name,
|
||||
'InstanceType': CONF.orchestration.instance_type,
|
||||
'ImageId': CONF.orchestration.image_ref,
|
||||
'ImageId': CONF.compute.image_ref,
|
||||
'ExternalNetworkId': cls.external_network_id,
|
||||
'timeout': CONF.orchestration.build_timeout,
|
||||
'DNSServers': CONF.network.dns_servers,
|
||||
|
@ -30,7 +30,7 @@ class StacksTestJSON(base.BaseOrchestrationTest):
|
||||
super(StacksTestJSON, cls).resource_setup()
|
||||
cls.stack_name = data_utils.rand_name('heat')
|
||||
template = cls.read_template('non_empty_stack')
|
||||
image_id = (CONF.orchestration.image_ref or
|
||||
image_id = (CONF.compute.image_ref or
|
||||
cls._create_image()['id'])
|
||||
flavor = CONF.orchestration.instance_type
|
||||
# create the stack
|
||||
|
@ -701,9 +701,6 @@ OrchestrationGroup = [
|
||||
default='m1.micro',
|
||||
help="Instance type for tests. Needs to be big enough for a "
|
||||
"full OS plus the test workload"),
|
||||
cfg.StrOpt('image_ref',
|
||||
help="Name of heat-cfntools enabled image to use when "
|
||||
"launching test instances."),
|
||||
cfg.StrOpt('keypair_name',
|
||||
help="Name of existing keypair to launch servers with."),
|
||||
cfg.IntOpt('max_template_size',
|
||||
|
Loading…
x
Reference in New Issue
Block a user