From 4ff31114e5175bfb331acab8cc4d82977045b585 Mon Sep 17 00:00:00 2001
From: Justin Shepherd <jshepher@rackspace.com>
Date: Wed, 18 Mar 2015 12:10:16 -0500
Subject: [PATCH] Updating defcore test definitions

Defcore now has its own repository, at
https://github.com/openstack/defcore. Updating the tempest gate script
to pull the json files from there. Also defcore is moving to a release
that does not match the branch names, so there is now a version map.

Change-Id: I7b70a8a9f036bb218e1d4d005998af8257835dcb
Closes-Bug: #1426442
---
 .../os_tempest/templates/openstack_tempest_gate.sh.j2    | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/playbooks/roles/os_tempest/templates/openstack_tempest_gate.sh.j2 b/playbooks/roles/os_tempest/templates/openstack_tempest_gate.sh.j2
index e58d2c62a0..991e7bab93 100644
--- a/playbooks/roles/os_tempest/templates/openstack_tempest_gate.sh.j2
+++ b/playbooks/roles/os_tempest/templates/openstack_tempest_gate.sh.j2
@@ -70,10 +70,13 @@ function gen_test_list_defcore(){
   python <<END
 import json
 import requests
+
 branch="$branch"
-url=("https://raw.githubusercontent.com/stackforge/"
-     "refstack/master/defcore/%(branch)score.json"
-     % {'branch': branch}
+map = {'juno': '2015.next', 'icehouse': '2015.03'}
+
+url=("https://raw.githubusercontent.com/openstack/"
+     "defcore/master/%(version).json"
+     % {'version': map[branch]}
      )
 response = requests.get(url)
 for capability in response.json()['capabilities'].values():