Merge "import zuul job settings from project-config"

This commit is contained in:
Zuul 2018-08-23 16:21:39 +00:00 committed by Gerrit Code Review
commit 2fff7da1cc
1 changed files with 14 additions and 7 deletions

View File

@ -7,15 +7,15 @@
mistral: https://git.openstack.org/openstack/mistral mistral: https://git.openstack.org/openstack/mistral
heat: https://git.openstack.org/openstack/heat heat: https://git.openstack.org/openstack/heat
devstack_services: devstack_services:
heat: True heat: true
h-api: True h-api: true
h-api-cfn: True h-api-cfn: true
h-api-cw: True h-api-cw: true
h-eng: True h-eng: true
tox_environment: tox_environment:
IDENTITY_API_VERSION: 3 IDENTITY_API_VERSION: 3
PYTHONUNBUFFERED: 'true' PYTHONUNBUFFERED: 'true'
MISTRAL_USE_MOD_WSGI: True MISTRAL_USE_MOD_WSGI: true
MISTRAL_RPC_IMPLEMENTATION: oslo MISTRAL_RPC_IMPLEMENTATION: oslo
MYSQL_ROOT_PW: secretdatabase MYSQL_ROOT_PW: secretdatabase
required-projects: required-projects:
@ -75,12 +75,18 @@
parent: openstack-tox parent: openstack-tox
vars: vars:
tox_envlist: unit-postgresql tox_envlist: unit-postgresql
tox_environment: { CI_PROJECT: "{{ zuul['project']['name'] }}" } tox_environment: {CI_PROJECT: "{{ zuul['project']['name'] }}"}
timeout: 3600 timeout: 3600
required-projects: required-projects:
- openstack/mistral-lib - openstack/mistral-lib
- project: - project:
templates:
- openstack-python-jobs
- openstack-python35-jobs
- publish-openstack-sphinx-docs
- check-requirements
- release-notes-jobs
check: check:
jobs: jobs:
- openstack-tox-cover: - openstack-tox-cover:
@ -118,6 +124,7 @@
required-projects: required-projects:
- openstack/mistral-lib - openstack/mistral-lib
gate: gate:
queue: mistral
jobs: jobs:
- mistral-devstack - mistral-devstack
- mistral-devstack-non-apache - mistral-devstack-non-apache