Shift voting flag and test_matrix_branch for ansible-devel job

We want the job to vote on the github side, but  not here. That means we
should list it as non-voting in our project pipeline definition and not
in the job definition itself.

We also want the job to run using master of devstack. Override the
test_matrix_branch variable.

Also, fix a comment because it's driving slaweq and I crazy.

Change-Id: Ic9d3983de641dbe618c65b2cbf2dcfa3686575df
This commit is contained in:
Monty Taylor 2018-01-31 08:50:02 -06:00
parent 78bcfe80dd
commit 34fb4820fb
No known key found for this signature in database
GPG Key ID: 7BAE94BC7141A594
1 changed files with 7 additions and 3 deletions

View File

@ -90,7 +90,7 @@
parent: shade-functional-devstack-base
description: |
Run shade functional tests against a legacy devstack
# TODO(mordred): This does not seem to
# TODO(mordred): This does not seem to work
voting: false
vars:
devstack_localrc:
@ -190,8 +190,11 @@
override-checkout: master
- name: openstack-dev/devstack
override-checkout: master
voting: false
vars:
# test-matrix grabs branch from the zuul branch setting. If the job
# is triggered by ansible, that branch will be devel which doesn't
# make sense to devstack. Override so that we run the right thing.
test_matrix_branch: master
tox_install_siblings: true
- project-template:
@ -216,7 +219,8 @@
jobs:
- bifrost-integration-tinyipa
- bifrost-integration-tinyipa-opensuse-423
- shade-ansible-devel-functional-devstack
- shade-ansible-devel-functional-devstack:
voting: false
- shade-ansible-functional-devstack
- shade-functional-devstack
- shade-functional-devstack-magnum