From aebb568eff3def7676e5667badf65fdd4caa8158 Mon Sep 17 00:00:00 2001 From: Gage Hugo Date: Mon, 10 Sep 2018 17:21:54 -0600 Subject: [PATCH] Rename py35 v3 only check This renames the "keystone-dsvm-py35-functional-v3-only" check to "keystone-dsvm-py35-functional-federation" in order to better describe what this job does. This also removes the "ENABLE_IDENTITY_V2=FALSE" setting since v2 has since been removed from keystone. Change-Id: If6c4a5844eb1d2f9f75c614634c781c2915c4a11 --- .zuul.yaml | 8 ++++---- .../post.yaml | 0 .../run.yaml | 4 +--- 3 files changed, 5 insertions(+), 7 deletions(-) rename playbooks/legacy/{keystone-dsvm-py35-functional-v3-only => keystone-dsvm-py35-functional-federation}/post.yaml (100%) rename playbooks/legacy/{keystone-dsvm-py35-functional-v3-only => keystone-dsvm-py35-functional-federation}/run.yaml (92%) diff --git a/.zuul.yaml b/.zuul.yaml index f775e66df3..dcd8df419b 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -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: diff --git a/playbooks/legacy/keystone-dsvm-py35-functional-v3-only/post.yaml b/playbooks/legacy/keystone-dsvm-py35-functional-federation/post.yaml similarity index 100% rename from playbooks/legacy/keystone-dsvm-py35-functional-v3-only/post.yaml rename to playbooks/legacy/keystone-dsvm-py35-functional-federation/post.yaml diff --git a/playbooks/legacy/keystone-dsvm-py35-functional-v3-only/run.yaml b/playbooks/legacy/keystone-dsvm-py35-functional-federation/run.yaml similarity index 92% rename from playbooks/legacy/keystone-dsvm-py35-functional-v3-only/run.yaml rename to playbooks/legacy/keystone-dsvm-py35-functional-federation/run.yaml index 0aa9faeb22..231208d1cd 100644 --- a/playbooks/legacy/keystone-dsvm-py35-functional-v3-only/run.yaml +++ b/playbooks/legacy/keystone-dsvm-py35-functional-federation/run.yaml @@ -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