From 219db9c669785d757d5e2d485f27fa91215d0b68 Mon Sep 17 00:00:00 2001 From: Clark Boylan Date: Tue, 14 Jul 2015 16:25:55 -0700 Subject: [PATCH] Revert "Use ubuntu-trusty for multi-node tests" This reverts commit 2b5b800d4fc48724da66e72e03812222125d3667. 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 --- dev/zuul/openstack_functions.py | 2 +- jenkins/jobs/projects.yaml | 12 ++++++------ zuul/openstack_functions.py | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dev/zuul/openstack_functions.py b/dev/zuul/openstack_functions.py index 3277661647..89c823862c 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'] = 'ubuntu-trusty-2-node' + params['ZUUL_NODE'] = 'devstack-trusty-2-node' else: params['ZUUL_NODE'] = 'devstack-trusty' diff --git a/jenkins/jobs/projects.yaml b/jenkins/jobs/projects.yaml index 28f39b7e81..dc6961e949 100755 --- a/jenkins/jobs/projects.yaml +++ b/jenkins/jobs/projects.yaml @@ -2956,32 +2956,32 @@ node: 'devstack-precise || devstack-trusty' - '{pipeline}-grenade-dsvm-multinode{branch-designator}': pipeline: check - node: 'devstack-trusty-2-node || ubuntu-trusty-2-node' + node: devstack-trusty-2-node branch-designator: '' branch-override: default - '{pipeline}-tempest-dsvm-multinode-full{branch-designator}': pipeline: check - node: 'devstack-trusty-2-node || ubuntu-trusty-2-node' + node: devstack-trusty-2-node branch-designator: '' branch-override: default - '{pipeline}-tempest-dsvm-neutron-multinode-full{branch-designator}': pipeline: check - node: 'devstack-trusty-2-node || ubuntu-trusty-2-node' + node: devstack-trusty-2-node branch-designator: '' branch-override: default - '{pipeline}-tempest-dsvm-neutron-dvr-multinode-full{branch-designator}': pipeline: check - node: 'devstack-trusty-2-node || ubuntu-trusty-2-node' + node: devstack-trusty-2-node branch-designator: '' branch-override: default - '{pipeline}-tempest-dsvm-multinode-smoke{branch-designator}': pipeline: check - node: 'devstack-trusty-2-node || ubuntu-trusty-2-node' + node: devstack-trusty-2-node branch-designator: '' branch-override: default - '{pipeline}-tempest-dsvm-neutron-multinode-smoke{branch-designator}': pipeline: check - node: 'devstack-trusty-2-node || ubuntu-trusty-2-node' + node: devstack-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 c879f5a01e..c5a4bb0c40 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'] = 'ubuntu-trusty-2-node' + params['ZUUL_NODE'] = 'devstack-trusty-2-node' else: params['ZUUL_NODE'] = 'devstack-trusty'