Enable NOVA_USE_SERVICE_TOKEN in nova-next job for Pike
We want to start testing a feature added to nova which sends a service user token along with the regular user token to other services like cinder and neutron during long-running operations. This relies on a change in devstack and we only run it on branches after stable/ocata. Change-Id: Iee859b3a09066dcbc60583210b4107b787f0d79a Depends-On: I2d7348c4a72af96c0ed2ef6c0ab75d16e9aec8fc
This commit is contained in:
parent
a6a32f2edd
commit
dca8771968
|
@ -54,6 +54,7 @@
|
|||
# -----------------------
|
||||
# Newton: Created job; placement and cells v2 were optional.
|
||||
# Ocata: placement and cells v2 are default and required.
|
||||
# Pike: Enabled send_service_user_token.
|
||||
- job-template:
|
||||
name: '{pipeline}-tempest-dsvm-neutron-nova-next-full-{node}{suffix}'
|
||||
node: '{node}'
|
||||
|
@ -83,6 +84,13 @@
|
|||
if [ "$BRANCH_OVERRIDE" != "default" ] ; then
|
||||
export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE
|
||||
fi
|
||||
|
||||
# NOTE(mriedem): NOVA_USE_SERVICE_TOKEN is available starting in Pike
|
||||
stable_compare="stable/[a-o]"
|
||||
if [[ ! "$ZUUL_BRANCH" =~ $stable_compare ]] ; then
|
||||
export DEVSTACK_LOCAL_CONFIG+=$'\n'"NOVA_USE_SERVICE_TOKEN=True"
|
||||
fi
|
||||
|
||||
function post_test_hook {{
|
||||
if [ -f $BASE/new/nova/tools/hooks/post_test_hook.sh ]; then
|
||||
$BASE/new/nova/tools/hooks/post_test_hook.sh
|
||||
|
|
|
@ -3543,10 +3543,11 @@ jobs:
|
|||
voting: false
|
||||
|
||||
# NOTE(mriedem): The nova-next job runs placement + cells v2 + neutron
|
||||
# which were all optional in newton but are defaults in ocata+ so we can
|
||||
# restrict the job to just running on stable/newton changes.
|
||||
# which were all optional in newton but are defaults in ocata+. In Pike we
|
||||
# made the job run with send_service_user_token so we want to run against
|
||||
# stable/newton and Pike (current master), but skip stable/ocata.
|
||||
- name: gate-tempest-dsvm-neutron-nova-next-full-ubuntu-xenial-nv
|
||||
branch: stable/newton
|
||||
branch: ^(stable/newton|master)$
|
||||
|
||||
- name: ^gate-swift3-tox-s3tests_
|
||||
voting: false
|
||||
|
|
Loading…
Reference in New Issue