openstack
/
heat
Code Issues Proposed changes

Merge "Remove obsolete identity-v3-only job"

This commit is contained in:
Zuul 2018-05-10 12:00:03 +00:00 committed by Gerrit Code Review
parent 0f1e2a0bc1 e5a9e8b966
commit 37b14dbe08
2 changed files with 0 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
.zuul.yaml
View File

@ -33,7 +33,6 @@
use_amqp1: 0 use_amqp1: 0
use_apache: 1 use_apache: 1
use_python3: 0 use_python3: 0
use_identity_v3_only: 0
branch_override: default branch_override: default
- job: - job:
@ -66,14 +65,6 @@
vars: vars:
use_python3: 1 use_python3: 1
- job:
name: heat-functional-convg-mysql-lbaasv2-identity-v3-only
parent: heat-functional-devstack-base
voting: false
branches: master
vars:
use_identity_v3_only: 1
- job: - job:
name: grenade-heat name: grenade-heat
parent: legacy-dsvm-base parent: legacy-dsvm-base
@ -118,7 +109,6 @@
- heat-functional-convg-mysql-lbaasv2-amqp1 - heat-functional-convg-mysql-lbaasv2-amqp1
- heat-functional-convg-mysql-lbaasv2-non-apache - heat-functional-convg-mysql-lbaasv2-non-apache
- heat-functional-convg-mysql-lbaasv2-py35 - heat-functional-convg-mysql-lbaasv2-py35
- heat-functional-convg-mysql-lbaasv2-identity-v3-only
- openstack-tox-lower-constraints - openstack-tox-lower-constraints
gate: gate:
jobs: jobs:

3
playbooks/devstack/functional/run.yaml
View File

@ -81,9 +81,6 @@
if [ "{{ branch_override }}" != "default" ] ; then if [ "{{ branch_override }}" != "default" ] ; then
export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE
fi fi
if [ "{{ use_identity_v3_only }}" -eq 1 ] ; then
export DEVSTACK_LOCAL_CONFIG+=$'\n'"ENABLE_IDENTITY_V2=False"
fi
if [ "{{ use_apache }}" -eq 0 ] ; then if [ "{{ use_apache }}" -eq 0 ] ; then
export DEVSTACK_LOCAL_CONFIG+=$'\n'"HEAT_USE_MOD_WSGI=False" export DEVSTACK_LOCAL_CONFIG+=$'\n'"HEAT_USE_MOD_WSGI=False"
fi fi