From 9c3794f87ca58a832da66b0143f0a85b19011621 Mon Sep 17 00:00:00 2001 From: Sean Dague Date: Thu, 12 May 2016 15:21:29 +0000 Subject: [PATCH] Revert "Actually use the service domain in V3 jobs" Devstack code doesn't work with this, and so all devstack / tempest jobs are now failing. This needs to be reverted, the devstack code fixed, then reapplied. This reverts commit 0376abf3feb3d9f1acdfc822b633208de8f2d2fa. Change-Id: I4fdd791c6b30b1a2f5bd3a1b4b0b59c3d17a2d80 --- jenkins/jobs/devstack-gate.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jenkins/jobs/devstack-gate.yaml b/jenkins/jobs/devstack-gate.yaml index aef940f03d..c79958381b 100644 --- a/jenkins/jobs/devstack-gate.yaml +++ b/jenkins/jobs/devstack-gate.yaml @@ -1548,7 +1548,7 @@ export DEVSTACK_GATE_TEMPEST_FULL=1 export DEVSTACK_GATE_NEUTRON=1 export DEVSTACK_LOCAL_CONFIG="ENABLE_IDENTITY_V2=False" - export DEVSTACK_LOCAL_CONFIG+=$'\n'"SERVICE_DOMAIN_NAME=service" + export DEVSTACK_LOCAL_CONFIG+=$'\n'"SERVICE_DOMAIN=service" export BRANCH_OVERRIDE={branch-override} if [ "$BRANCH_OVERRIDE" != "default" ] ; then export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE