Use ubuntu-trusty for multi-node tests

Because we want to move to it anyway, and it lets us fix the hostname
problem with glean.

Depends-On: I67ea62ebf9360f72f121d77acd1cbd35d8db728b
Change-Id: Iabe8b0f0cac9d80180b9542263ade5ffdfe641a2
This commit is contained in:
Monty Taylor 2015-07-08 17:28:30 -04:00
parent ef74d73624
commit 2b5b800d4f
3 changed files with 8 additions and 8 deletions

View File

@ -55,7 +55,7 @@ def devstack_params(item, job, params):
elif 'centos7' in job.name:
params['ZUUL_NODE'] = 'devstack-centos7'
elif 'multinode' in job.name:
params['ZUUL_NODE'] = 'devstack-trusty-2-node'
params['ZUUL_NODE'] = 'ubuntu-trusty-2-node'
else:
params['ZUUL_NODE'] = 'devstack-trusty'

View File

@ -2978,32 +2978,32 @@
node: 'devstack-precise || devstack-trusty'
- '{pipeline}-grenade-dsvm-multinode{branch-designator}':
pipeline: check
node: devstack-trusty-2-node
node: 'devstack-trusty-2-node || ubuntu-trusty-2-node'
branch-designator: ''
branch-override: default
- '{pipeline}-tempest-dsvm-multinode-full{branch-designator}':
pipeline: check
node: devstack-trusty-2-node
node: 'devstack-trusty-2-node || ubuntu-trusty-2-node'
branch-designator: ''
branch-override: default
- '{pipeline}-tempest-dsvm-neutron-multinode-full{branch-designator}':
pipeline: check
node: devstack-trusty-2-node
node: 'devstack-trusty-2-node || ubuntu-trusty-2-node'
branch-designator: ''
branch-override: default
- '{pipeline}-tempest-dsvm-neutron-dvr-multinode-full{branch-designator}':
pipeline: check
node: devstack-trusty-2-node
node: 'devstack-trusty-2-node || ubuntu-trusty-2-node'
branch-designator: ''
branch-override: default
- '{pipeline}-tempest-dsvm-multinode-smoke{branch-designator}':
pipeline: check
node: devstack-trusty-2-node
node: 'devstack-trusty-2-node || ubuntu-trusty-2-node'
branch-designator: ''
branch-override: default
- '{pipeline}-tempest-dsvm-neutron-multinode-smoke{branch-designator}':
pipeline: check
node: devstack-trusty-2-node
node: 'devstack-trusty-2-node || ubuntu-trusty-2-node'
branch-designator: ''
branch-override: default
# Experimental jobs for testing dib images.

View File

@ -55,7 +55,7 @@ def devstack_params(item, job, params):
elif 'centos7' in job.name:
params['ZUUL_NODE'] = 'devstack-centos7'
elif 'multinode' in job.name:
params['ZUUL_NODE'] = 'devstack-trusty-2-node'
params['ZUUL_NODE'] = 'ubuntu-trusty-2-node'
else:
params['ZUUL_NODE'] = 'devstack-trusty'