Merge "Rename py35 v3 only check"

This commit is contained in:
Zuul 2018-09-14 05:27:21 +00:00 committed by Gerrit Code Review
commit 50698fd128
3 changed files with 5 additions and 7 deletions

View File

@ -48,10 +48,10 @@
- ^releasenotes/.*$
- job:
name: keystone-dsvm-py35-functional-v3-only
name: keystone-dsvm-py35-functional-federation
parent: legacy-dsvm-base
run: playbooks/legacy/keystone-dsvm-py35-functional-v3-only/run.yaml
post-run: playbooks/legacy/keystone-dsvm-py35-functional-v3-only/post.yaml
run: playbooks/legacy/keystone-dsvm-py35-functional-federation/run.yaml
post-run: playbooks/legacy/keystone-dsvm-py35-functional-federation/post.yaml
timeout: 4200
voting: false
required-projects:
@ -138,7 +138,7 @@
jobs:
- keystone-dsvm-functional
- keystone-dsvm-functional-v3-only
- keystone-dsvm-py35-functional-v3-only
- keystone-dsvm-py35-functional-federation
- openstack-ansible-keystone-rolling-upgrade
- openstack-tox-lower-constraints
- legacy-keystoneclient-dsvm-functional:

View File

@ -1,6 +1,5 @@
- hosts: all
name: Autoconverted job legacy-keystone-dsvm-py35-functional-v3-only from old job
gate-keystone-dsvm-py35-functional-v3-only-ubuntu-xenial-nv
name: Autoconverted job legacy-keystone-dsvm-py35-functional-federation
tasks:
- name: Ensure legacy workspace directory
@ -36,7 +35,6 @@
disable_service s-container
disable_service s-object
disable_service s-proxy
ENABLE_IDENTITY_V2=False
enable_plugin keystone git://git.openstack.org/openstack/keystone
EOF