From f06ca68f948938c0eef68c441a605c7e0c553081 Mon Sep 17 00:00:00 2001 From: Sean Dague Date: Tue, 14 Apr 2015 20:09:41 -0400 Subject: [PATCH] change name from aiopcpu to multinode aiopcpu is an exceptionally cryptic name that doesn't mean anything to most people reading test results. multinode is what the job is, and is much more understandable at first glance. This changes the naming from aiopcpu => multinode. Should we create a different kind of multinode test in the future, we can come up with an appropriate name for it then. This is safe to change because the devstack-gate logic actually is fully != 'aio', not == 'aiopcpu'. Change-Id: Ic7fe31a397af8a14ecf33a4902908ff9c03d11d3 --- dev/zuul/openstack_functions.py | 2 +- jenkins/jobs/devstack-gate.yaml | 8 ++++---- jenkins/jobs/projects.yaml | 4 ++-- zuul/layout.yaml | 22 +++++++++++----------- zuul/openstack_functions.py | 2 +- 5 files changed, 19 insertions(+), 19 deletions(-) diff --git a/dev/zuul/openstack_functions.py b/dev/zuul/openstack_functions.py index 1568ec1848..607b1f732c 100644 --- a/dev/zuul/openstack_functions.py +++ b/dev/zuul/openstack_functions.py @@ -54,7 +54,7 @@ def devstack_params(item, job, params): params['ZUUL_NODE'] = 'devstack-precise' elif 'centos7' in job.name: params['ZUUL_NODE'] = 'devstack-centos7' - elif 'aiopcpu' in job.name: + elif 'multinode' in job.name: params['ZUUL_NODE'] = 'devstack-trusty-2-node' else: params['ZUUL_NODE'] = 'devstack-trusty' diff --git a/jenkins/jobs/devstack-gate.yaml b/jenkins/jobs/devstack-gate.yaml index 385666bf7a..49c54af353 100644 --- a/jenkins/jobs/devstack-gate.yaml +++ b/jenkins/jobs/devstack-gate.yaml @@ -1830,7 +1830,7 @@ - console-log - job-template: - name: '{pipeline}-tempest-dsvm-aiopcpu-full{branch-designator}' + name: '{pipeline}-tempest-dsvm-multinode-full{branch-designator}' node: '{node}' wrappers: @@ -1853,7 +1853,7 @@ if [ "$BRANCH_OVERRIDE" != "default" ] ; then export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE fi - export DEVSTACK_GATE_TOPOLOGY="aiopcpu" + export DEVSTACK_GATE_TOPOLOGY="multinode" cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh @@ -1864,7 +1864,7 @@ - job-template: - name: '{pipeline}-tempest-dsvm-neutron-aiopcpu-full{branch-designator}' + name: '{pipeline}-tempest-dsvm-neutron-multinode-full{branch-designator}' node: '{node}' wrappers: @@ -1888,7 +1888,7 @@ if [ "$BRANCH_OVERRIDE" != "default" ] ; then export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE fi - export DEVSTACK_GATE_TOPOLOGY="aiopcpu" + export DEVSTACK_GATE_TOPOLOGY="multinode" cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh diff --git a/jenkins/jobs/projects.yaml b/jenkins/jobs/projects.yaml index 83309263c0..6ef532bad5 100755 --- a/jenkins/jobs/projects.yaml +++ b/jenkins/jobs/projects.yaml @@ -2001,12 +2001,12 @@ # Special jobs for devstack-gate - devstack-gate-jobs: node: 'devstack-precise || devstack-trusty' - - '{pipeline}-tempest-dsvm-aiopcpu-full{branch-designator}': + - '{pipeline}-tempest-dsvm-multinode-full{branch-designator}': pipeline: check node: devstack-trusty-2-node branch-designator: '' branch-override: default - - '{pipeline}-tempest-dsvm-neutron-aiopcpu-full{branch-designator}': + - '{pipeline}-tempest-dsvm-neutron-multinode-full{branch-designator}': pipeline: check node: devstack-trusty-2-node branch-designator: '' diff --git a/zuul/layout.yaml b/zuul/layout.yaml index 9c8ceab73b..21478e0b86 100755 --- a/zuul/layout.yaml +++ b/zuul/layout.yaml @@ -691,10 +691,10 @@ jobs: - name: check-tempest-dsvm-centos7 branch: ^(?!stable/icehouse).*$ voting: false - - name: check-tempest-dsvm-aiopcpu-full + - name: check-tempest-dsvm-multinode-full branch: ^(?!stable/(icehouse|juno)).*$ voting: false - - name: check-tempest-dsvm-neutron-aiopcpu-full + - name: check-tempest-dsvm-neutron-multinode-full branch: ^(?!stable/(icehouse|juno)).*$ voting: false - name: ^gate-designate-dsvm-.*$ @@ -1580,7 +1580,7 @@ projects: post: - neutron-coverage experimental: - - check-tempest-dsvm-neutron-aiopcpu-full + - check-tempest-dsvm-neutron-multinode-full - gate-grenade-dsvm-neutron-forward - check-grenade-dsvm-neutron-sideways @@ -1654,7 +1654,7 @@ projects: - check-tempest-dsvm-nova-v21-neutron-full - check-tempest-dsvm-cells - check-tempest-dsvm-full-ceph - - check-tempest-dsvm-aiopcpu-full + - check-tempest-dsvm-multinode-full gate: - gate-nova-tox-functional - gate-devstack-dsvm-cells @@ -1668,7 +1668,7 @@ projects: - gate-grenade-dsvm-forward - check-tempest-dsvm-neutron-pg - gate-nova-pip-missing-reqs - - check-tempest-dsvm-neutron-aiopcpu-full + - check-tempest-dsvm-neutron-multinode-full - experimental-nova-dsvm-python27 - check-tempest-dsvm-f21 @@ -2997,8 +2997,8 @@ projects: - periodic-tempest-dsvm-all-master - periodic-tempest-dsvm-stress-master - check-tempest-dsvm-stress-keystonev3 - - check-tempest-dsvm-aiopcpu-full - - check-tempest-dsvm-neutron-aiopcpu-full + - check-tempest-dsvm-multinode-full + - check-tempest-dsvm-neutron-multinode-full - gate-grenade-dsvm-forward - check-tempest-dsvm-cells - check-tempest-dsvm-mongodb-zaqar @@ -3313,8 +3313,8 @@ projects: experimental: - check-ironic-dsvm-functional - check-neutron-dsvm-functional - - check-tempest-dsvm-aiopcpu-full - - check-tempest-dsvm-neutron-aiopcpu-full + - check-tempest-dsvm-multinode-full + - check-tempest-dsvm-neutron-multinode-full - check-tempest-dsvm-cells - check-tempest-dsvm-mongodb-zaqar - gate-grenade-dsvm-forward @@ -3508,8 +3508,8 @@ projects: - gate-swift-dsvm-functional experimental: - gate-grenade-dsvm-forward - - check-tempest-dsvm-aiopcpu-full - - check-tempest-dsvm-neutron-aiopcpu-full + - check-tempest-dsvm-multinode-full + - check-tempest-dsvm-neutron-multinode-full - check-grenade-dsvm-neutron-sideways - name: openstack-infra/elastic-recheck diff --git a/zuul/openstack_functions.py b/zuul/openstack_functions.py index 1014d8e326..bdd45ebb20 100644 --- a/zuul/openstack_functions.py +++ b/zuul/openstack_functions.py @@ -54,7 +54,7 @@ def devstack_params(item, job, params): params['ZUUL_NODE'] = 'devstack-precise' elif 'centos7' in job.name: params['ZUUL_NODE'] = 'devstack-centos7' - elif 'aiopcpu' in job.name: + elif 'multinode' in job.name: params['ZUUL_NODE'] = 'devstack-trusty-2-node' else: params['ZUUL_NODE'] = 'devstack-trusty'