diff --git a/dev/zuul/openstack_functions.py b/dev/zuul/openstack_functions.py index 89c823862c..3277661647 100644 --- a/dev/zuul/openstack_functions.py +++ b/dev/zuul/openstack_functions.py @@ -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' diff --git a/jenkins/jobs/projects.yaml b/jenkins/jobs/projects.yaml index 663535a7dc..0107e549a4 100755 --- a/jenkins/jobs/projects.yaml +++ b/jenkins/jobs/projects.yaml @@ -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. diff --git a/zuul/openstack_functions.py b/zuul/openstack_functions.py index 495fb91377..5c60429490 100644 --- a/zuul/openstack_functions.py +++ b/zuul/openstack_functions.py @@ -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'