[Manila] Update grenade job configuration
For the moment grenade manila job uses default heavy 'generic' driver. But it is redundant. So, do following: - Switch that job for usage of lightweight dummy driver - Disable all redundant services - Make that job non-voting until we merge all required changes to manila project according to this change. Change-Id: I2b698f69a29ef983b13534b2f4d393570be4dac8
This commit is contained in:
parent
a10e97db5c
commit
b6c600738f
@ -158,9 +158,11 @@
|
||||
export PROJECTS="openstack-dev/grenade $PROJECTS"
|
||||
export PROJECTS="openstack/python-manilaclient $PROJECTS"
|
||||
export PYTHONUNBUFFERED=true
|
||||
export DEVSTACK_GATE_NEUTRON=1
|
||||
export DEVSTACK_GATE_NEUTRON=0
|
||||
export DEVSTACK_GATE_GRENADE=pullup
|
||||
export ENABLED_SERVICES=tempest
|
||||
|
||||
# Basic services needed for grenade manila job using dummy driver
|
||||
export OVERRIDE_ENABLED_SERVICES=key,mysql,rabbit
|
||||
|
||||
# Enable manila grenade plugin. Provided repo should be
|
||||
# cloned by zuul before devstack run and below provided
|
||||
@ -170,6 +172,14 @@
|
||||
# Keep localrc to be able to set some vars in pre_test_hook
|
||||
export KEEP_LOCALRC=1
|
||||
|
||||
function pre_test_hook {{
|
||||
source $BASE/new/manila/contrib/ci/pre_test_hook.sh \
|
||||
True \
|
||||
dummy \
|
||||
multibackend
|
||||
}}
|
||||
export -f pre_test_hook
|
||||
|
||||
export BRANCH_OVERRIDE={branch-override}
|
||||
if [ "$BRANCH_OVERRIDE" != "default" ] ; then
|
||||
export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE
|
||||
|
@ -6352,7 +6352,7 @@
|
||||
- 'ubuntu-xenial'
|
||||
pipeline: 'gate'
|
||||
branch-override: default
|
||||
suffix: ''
|
||||
suffix: '-nv'
|
||||
- 'gate-manila-tempest-minimal-dsvm-{driver}-{node}{suffix}':
|
||||
node:
|
||||
- 'ubuntu-trusty'
|
||||
|
@ -10808,7 +10808,7 @@ projects:
|
||||
- gate-manila-tempest-minimal-dsvm-dummy-ubuntu-xenial
|
||||
- gate-manila-tempest-minimal-dsvm-lvm-ubuntu-trusty
|
||||
- gate-manila-tempest-minimal-dsvm-lvm-ubuntu-xenial
|
||||
- gate-grenade-dsvm-manila-ubuntu-xenial
|
||||
- gate-grenade-dsvm-manila-ubuntu-xenial-nv
|
||||
gate:
|
||||
- gate-manila-tox-genconfig-ubuntu-trusty
|
||||
- gate-manila-tox-genconfig-ubuntu-xenial
|
||||
@ -10817,7 +10817,6 @@ projects:
|
||||
- gate-manila-tempest-minimal-dsvm-dummy-ubuntu-xenial
|
||||
- gate-manila-tempest-minimal-dsvm-lvm-ubuntu-trusty
|
||||
- gate-manila-tempest-minimal-dsvm-lvm-ubuntu-xenial
|
||||
- gate-grenade-dsvm-manila-ubuntu-xenial
|
||||
post:
|
||||
- manila-coverage-db-ubuntu-trusty
|
||||
- manila-coverage-db-ubuntu-xenial
|
||||
|
Loading…
x
Reference in New Issue
Block a user