openstack/project-config
Code Issues Proposed changes

Merge "change name from aiopcpu to multinode"

Browse Source
This commit is contained in:
Jenkins 2015-04-15 12:53:53 +00:00 committed by Gerrit Code Review
commit 301f8e0ac7
5 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dev/zuul/openstack_functions.py
View File

@ -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'

8
jenkins/jobs/devstack-gate.yaml
View File

@ -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:
@ -1889,7 +1889,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

4
jenkins/jobs/projects.yaml
View File

@ -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: ''

22
zuul/layout.yaml
View File

@ -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

2
zuul/openstack_functions.py
View File

@ -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'