openstack/project-config
Code Issues Proposed changes

Fix swift enable/disable logic in rally-dsmv-* jobs

Browse Source 
Desire state is that all rally-dsvm jobs, except py35,
are deploying Swfit. Perviously we have wrong logic for disabling
Swift (it was disable only when it was enabled).

Now we are fixing the behaviour and configurution of all jobs, so jobs
would be configured properly.

Change-Id: I787bdc5f83efc96237dfcdaa0fa7a909baba8956
This commit is contained in:
Boris Pavlovic 2017-07-27 18:21:22 -07:00 committed by Boris Pavlovic
parent 800a497a4c
commit 68b8f3b778
2 changed files with 8 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
jenkins/jobs/projects.yaml
View File

@ -1254,10 +1254,8 @@
- gate-rally-dsvm-{name}-{node}{suffix}:
node: ubuntu-xenial
suffix: '-nv'
swift: '0'
- gate-rally-dsvm-py35-{name}{suffix}:
suffix: '-nv'
swift: '0'
- '{pipeline}-cinder-dsvm-apache-{node}{suffix}':
pipeline: gate
node: ubuntu-xenial
@ -4989,10 +4987,8 @@
- gate-rally-dsvm-{name}-{node}{suffix}:
node: ubuntu-xenial
suffix: '-nv'
swift: '0'
- gate-rally-dsvm-py35-{name}{suffix}:
suffix: '-nv'
swift: '0'
- '{pipeline}-glance-dsvm-grenade-multinode-{node-release}{suffix}':
pipeline: gate
node: ubuntu-xenial-2-node
@ -5982,7 +5978,6 @@
- gate-rally-dsvm-{name}-{node}{suffix}:
node: ubuntu-xenial
suffix: '-nv'
swift: '0'
- api-ref-jobs:
service: identity
- 'gate-{name}-tox-{envlist}-{node}':
@ -13024,7 +13019,6 @@
- gate-rally-dsvm-{name}-{node}{suffix}:
node: ubuntu-xenial
suffix: ''
swift: '1'
- gate-rally-dsvm-designate-{name}-{driver}-{node}{suffix}:
node: ubuntu-xenial
suffix: '-nv'

16
jenkins/jobs/rally.yaml
View File

@ -90,7 +90,7 @@
ENABLED_SERVICES+=n-api,n-crt,n-cpu,n-sch,n-cond,
ENABLED_SERVICES+=q-qos,
if [ $DEVSTACK_GATE_SWIFT -ne 1 ];
if [ $DEVSTACK_GATE_SWIFT -eq 1 ];
then
ENABLED_SERVICES+=s-proxy,s-account,s-container,s-object,
else
@ -599,7 +599,7 @@
prepopulate_users: '0'
watcher: '0'
telemetry: '0'
swift: '{swift}'
swift: '1'
heat: '0'
py35: 'False'
@ -631,7 +631,7 @@
prepopulate_users: '0'
watcher: '0'
telemetry: '{telemetry}'
swift: '0'
swift: '1'
heat: '0'
py35: 'False'
@ -662,7 +662,7 @@
prepopulate_users: '0'
watcher: '0'
telemetry: '0'
swift: '0'
swift: '1'
heat: '0'
py35: 'False'
@ -693,7 +693,7 @@
prepopulate_users: '1'
watcher: '0'
telemetry: '0'
swift: '0'
swift: '1'
heat: '0'
py35: 'False'
@ -725,7 +725,7 @@
prepopulate_users: '0'
watcher: '0'
telemetry: '0'
swift: '0'
swift: '1'
heat: '0'
py35: 'False'
@ -757,7 +757,7 @@
prepopulate_users: '0'
watcher: '0'
telemetry: '0'
swift: '0'
swift: '1'
heat: '0'
py35: 'False'
@ -788,7 +788,7 @@
prepopulate_users: '0'
watcher: '0'
telemetry: '0'
swift: '0'
swift: '1'
heat: '{heat}'
py35: 'False'