openstack/project-config
Code Issues Proposed changes

Revert "Use ubuntu-trusty for multi-node tests"

Browse Source 
This reverts commit 2b5b800d4f. These new
images cannot be reliably uploaded to rackspace which makes iterating on
image updates/fixes very difficult. Switch back to the old image (using
new shorter hostnames) to get multinode working again. We can switch
back when we have uploads sorted out.

Change-Id: I46e051a4a566ae400c2fc153ad72596c853af32c
This commit is contained in:
Clark Boylan 2015-07-14 16:25:55 -07:00
parent d3dfbb8f88
commit 219db9c669
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dev/zuul/openstack_functions.py
View File

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

12
jenkins/jobs/projects.yaml
View File

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

2
zuul/openstack_functions.py
View File

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