openstack/project-config
Code Issues Proposed changes

[rally] Use neutron everywhere

Browse Source 
Nova-network is dead now[*]. We need to switch all our jobs to neutron.

[*] - https://review.openstack.org/#/c/403855/

Change-Id: I490d9bcfc477a07e5f8273a65f5532d3de39ab99
This commit is contained in:
Andrey Kurilin 2016-12-07 13:09:13 +02:00
parent a7a953c2e7
commit 3427382dd7
2 changed files with 7 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
jenkins/jobs/projects.yaml
View File

@ -13731,7 +13731,6 @@
compare: 1 compare: 1
ceilometer: 0 ceilometer: 0
heat: 0 heat: 0
neutron: 0
sahara: 0 sahara: 0
- gate-rally-dsvm-verify-{job-mode}-{ctx-mode}: - gate-rally-dsvm-verify-{job-mode}-{ctx-mode}:
job-mode: full job-mode: full
@ -13739,7 +13738,6 @@
compare: 0 compare: 0
ceilometer: 1 ceilometer: 1
heat: 1 heat: 1
neutron: 1
sahara: 1 sahara: 1
- gate-rally-dsvm-verify-{job-mode}-{ctx-mode}: - gate-rally-dsvm-verify-{job-mode}-{ctx-mode}:
job-mode: light job-mode: light
@ -13747,7 +13745,6 @@
compare: 1 compare: 1
ceilometer: 1 ceilometer: 1
heat: 1 heat: 1
neutron: 1
sahara: 1 sahara: 1
- gate-rally-dsvm-verify-{job-mode}-{ctx-mode}: - gate-rally-dsvm-verify-{job-mode}-{ctx-mode}:
job-mode: full job-mode: full
@ -13755,7 +13752,6 @@
compare: 0 compare: 0
ceilometer: 1 ceilometer: 1
heat: 1 heat: 1
neutron: 1
sahara: 1 sahara: 1
- gate-rally-dsvm-certification-with-keystone-{keystone-version}{job-suffix}: - gate-rally-dsvm-certification-with-keystone-{keystone-version}{job-suffix}:
keystone-version: v2 keystone-version: v2
@ -13781,13 +13777,10 @@
- gate-rally-dsvm-rally-{service}: - gate-rally-dsvm-rally-{service}:
service: cinder service: cinder
heat: 0 heat: 0
neutron: 0
- gate-rally-dsvm-rally-{service}: - gate-rally-dsvm-rally-{service}:
service: heat service: heat
heat: 1 heat: 1
neutron: 1
- gate-rally-dsvm-rally-{service}: - gate-rally-dsvm-rally-{service}:
neutron: 0
heat: 0 heat: 0
service: nova service: nova
- gate-rally-dsvm-{name}-{node}{job-suffix}: - gate-rally-dsvm-{name}-{node}{job-suffix}:

40
jenkins/jobs/rally.yaml
View File

@ -51,7 +51,6 @@
#!/bin/bash -xe #!/bin/bash -xe
export PROJECTS="openstack/rally $PROJECTS" export PROJECTS="openstack/rally $PROJECTS"
export DEVSTACK_GATE_NEUTRON={neutron}
export DEVSTACK_GATE_NEUTRON_EXTENSIONS={neutron_extensions} export DEVSTACK_GATE_NEUTRON_EXTENSIONS={neutron_extensions}
export DEVSTACK_GATE_IRONIC={ironic} export DEVSTACK_GATE_IRONIC={ironic}
export DEVSTACK_GATE_ZAQAR={zaqar} export DEVSTACK_GATE_ZAQAR={zaqar}
@ -94,14 +93,9 @@
export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin heat https://git.openstack.org/openstack/heat" export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin heat https://git.openstack.org/openstack/heat"
fi fi
if [ $DEVSTACK_GATE_NEUTRON -ne 1 ]; then export PROJECTS="openstack/neutron $PROJECTS"
ENABLED_SERVICES+=n-net,n-api-meta, export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin neutron git://git.openstack.org/openstack/neutron"
fi if [ $DEVSTACK_GATE_NEUTRON_EXTENSIONS -ne 0 ]; then
if [ $DEVSTACK_GATE_NEUTRON -ne 0 ]; then
export PROJECTS="openstack/neutron $PROJECTS"
export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin neutron git://git.openstack.org/openstack/neutron"
fi
if [ $DEVSTACK_GATE_NEUTRON -ne 0 -a $DEVSTACK_GATE_NEUTRON_EXTENSIONS -ne 0 ]; then
export PROJECTS="openstack/neutron-lbaas $PROJECTS" export PROJECTS="openstack/neutron-lbaas $PROJECTS"
export PROJECTS="openstack/octavia $PROJECTS" export PROJECTS="openstack/octavia $PROJECTS"
export PROJECTS="openstack/neutron-fwaas $PROJECTS" export PROJECTS="openstack/neutron-fwaas $PROJECTS"
@ -343,7 +337,6 @@
export PROJECTS="openstack/murano-dashboard $PROJECTS" export PROJECTS="openstack/murano-dashboard $PROJECTS"
export PROJECTS="openstack/python-muranoclient $PROJECTS" export PROJECTS="openstack/python-muranoclient $PROJECTS"
export DEVSTACK_GATE_NEUTRON={neutron}
export DEVSTACK_GATE_TEMPEST_LARGE_OPS={large_ops} export DEVSTACK_GATE_TEMPEST_LARGE_OPS={large_ops}
export DEVSTACK_GATE_EXERCISES=0 export DEVSTACK_GATE_EXERCISES=0
export RALLY_SCENARIO={scenario} export RALLY_SCENARIO={scenario}
@ -387,7 +380,6 @@
export PROJECTS="openstack/mistral-dashboard $PROJECTS" export PROJECTS="openstack/mistral-dashboard $PROJECTS"
export PROJECTS="openstack/python-mistralclient $PROJECTS" export PROJECTS="openstack/python-mistralclient $PROJECTS"
export DEVSTACK_GATE_NEUTRON={neutron}
export DEVSTACK_GATE_TEMPEST_LARGE_OPS={large_ops} export DEVSTACK_GATE_TEMPEST_LARGE_OPS={large_ops}
export DEVSTACK_GATE_EXERCISES=0 export DEVSTACK_GATE_EXERCISES=0
export RALLY_SCENARIO={scenario} export RALLY_SCENARIO={scenario}
@ -419,7 +411,6 @@
builders: builders:
- devstack-rally-gate: - devstack-rally-gate:
scenario: '{name}-ironic' scenario: '{name}-ironic'
neutron: '1'
neutron_extensions: '0' neutron_extensions: '0'
ironic: '1' ironic: '1'
zaqar: '0' zaqar: '0'
@ -489,7 +480,6 @@
builders: builders:
- devstack-murano-rally-gate: - devstack-murano-rally-gate:
scenario: '{name}-murano' scenario: '{name}-murano'
neutron: '1'
neutron_extensions: '0' neutron_extensions: '0'
large_ops: '0' large_ops: '0'
@ -511,7 +501,6 @@
builders: builders:
- devstack-mistral-rally-gate: - devstack-mistral-rally-gate:
scenario: '{name}-mistral' scenario: '{name}-mistral'
neutron: '0'
large_ops: '0' large_ops: '0'
publishers: publishers:
@ -574,7 +563,6 @@
- devstack-rally-gate: - devstack-rally-gate:
scenario: '{name}' scenario: '{name}'
ironic: '0' ironic: '0'
neutron: '0'
neutron_extensions: '0' neutron_extensions: '0'
zaqar: '0' zaqar: '0'
large_ops: '0' large_ops: '0'
@ -606,7 +594,6 @@
- devstack-rally-gate: - devstack-rally-gate:
scenario: '{name}-neutron' scenario: '{name}-neutron'
ironic: '0' ironic: '0'
neutron: '1'
neutron_extensions: '0' neutron_extensions: '0'
zaqar: '0' zaqar: '0'
large_ops: '0' large_ops: '0'
@ -637,7 +624,6 @@
- devstack-rally-gate: - devstack-rally-gate:
scenario: '{name}-neutron' scenario: '{name}-neutron'
ironic: '0' ironic: '0'
neutron: '1'
neutron_extensions: '1' neutron_extensions: '1'
zaqar: '0' zaqar: '0'
large_ops: '0' large_ops: '0'
@ -668,7 +654,6 @@
- devstack-rally-gate: - devstack-rally-gate:
scenario: '{name}-neutron-existing-users' scenario: '{name}-neutron-existing-users'
ironic: '0' ironic: '0'
neutron: '1'
neutron_extensions: '0' neutron_extensions: '0'
zaqar: '0' zaqar: '0'
large_ops: '0' large_ops: '0'
@ -700,7 +685,6 @@
- devstack-rally-gate: - devstack-rally-gate:
scenario: '{name}-fakevirt' scenario: '{name}-fakevirt'
ironic: '0' ironic: '0'
neutron: '0'
neutron_extensions: '0' neutron_extensions: '0'
zaqar: '0' zaqar: '0'
large_ops: '10' large_ops: '10'
@ -732,7 +716,6 @@
- devstack-rally-gate: - devstack-rally-gate:
scenario: '{name}-zaqar' scenario: '{name}-zaqar'
ironic: '0' ironic: '0'
neutron: '0'
neutron_extensions: '0' neutron_extensions: '0'
zaqar: '1' zaqar: '1'
large_ops: '0' large_ops: '0'
@ -763,7 +746,6 @@
- devstack-rally-gate: - devstack-rally-gate:
scenario: '{service}' scenario: '{service}'
ironic: '0' ironic: '0'
neutron: '{neutron}'
neutron_extensions: '0' neutron_extensions: '0'
zaqar: '0' zaqar: '0'
large_ops: '0' large_ops: '0'
@ -890,7 +872,6 @@
compare: '{compare}' compare: '{compare}'
ceilometer: '{ceilometer}' ceilometer: '{ceilometer}'
heat: '{heat}' heat: '{heat}'
neutron: '{neutron}'
sahara: '{sahara}' sahara: '{sahara}'
publishers: publishers:
@ -909,7 +890,6 @@
export DEVSTACK_GATE_CEILOMETER={ceilometer} export DEVSTACK_GATE_CEILOMETER={ceilometer}
export DEVSTACK_GATE_HEAT={heat} export DEVSTACK_GATE_HEAT={heat}
export DEVSTACK_GATE_NEUTRON={neutron}
export DEVSTACK_GATE_SAHARA={sahara} export DEVSTACK_GATE_SAHARA={sahara}
export DEVSTACK_GATE_EXERCISES=0 export DEVSTACK_GATE_EXERCISES=0
@ -931,12 +911,10 @@
ENABLED_SERVICES+=n-obj, ENABLED_SERVICES+=n-obj,
fi fi
ENABLED_SERVICES+=s-proxy,s-account,s-container,s-object, ENABLED_SERVICES+=s-proxy,s-account,s-container,s-object,
if [ $DEVSTACK_GATE_NEUTRON -ne 1 ]; then
ENABLED_SERVICES+=n-net,n-api-meta, export PROJECTS="openstack/neutron $PROJECTS"
else export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin neutron git://git.openstack.org/openstack/neutron"
ENABLED_SERVICES+=q-svc,q-dhcp,q-meta,q-agt,q-l3,
export DISABLED_SERVICES=n-net
fi
if [ $DEVSTACK_GATE_CEILOMETER -ne 0 ]; then if [ $DEVSTACK_GATE_CEILOMETER -ne 0 ]; then
export CEILOMETER_NOTIFICATION_TOPICS=notifications,profiler export CEILOMETER_NOTIFICATION_TOPICS=notifications,profiler
@ -1058,7 +1036,6 @@
- devstack-rally-gate: - devstack-rally-gate:
scenario: 'rally-keystone-api-v2' scenario: 'rally-keystone-api-v2'
ironic: '0' ironic: '0'
neutron: '0'
neutron_extensions: '0' neutron_extensions: '0'
zaqar: '0' zaqar: '0'
large_ops: '0' large_ops: '0'
@ -1089,7 +1066,6 @@
- devstack-rally-gate: - devstack-rally-gate:
scenario: '{name}-senlin' scenario: '{name}-senlin'
ironic: '0' ironic: '0'
neutron: '1'
neutron_extensions: '0' neutron_extensions: '0'
zaqar: '0' zaqar: '0'
large_ops: '0' large_ops: '0'
@ -1121,7 +1097,6 @@
- devstack-rally-gate: - devstack-rally-gate:
scenario: '{name}-watcher' scenario: '{name}-watcher'
ironic: '0' ironic: '0'
neutron: '0'
neutron_extensions: '0' neutron_extensions: '0'
zaqar: '0' zaqar: '0'
large_ops: '0' large_ops: '0'
@ -1153,7 +1128,6 @@
- devstack-rally-gate: - devstack-rally-gate:
scenario: '{name}-magnum' scenario: '{name}-magnum'
ironic: '0' ironic: '0'
neutron: '1'
neutron_extensions: '0' neutron_extensions: '0'
zaqar: '0' zaqar: '0'
large_ops: '0' large_ops: '0'