From cd580de2c264b4666e69d9e1fdd3b57b4a959ff4 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Evrard <jean-philippe@evrard.me>
Date: Fri, 16 Feb 2018 13:17:33 +0000
Subject: [PATCH] Fix neutron upgrades

With the latest ops changes, we use the clouds.yaml
file for API testing.

We therefore need to generate it on localhost, where the
API tests are located.

On top of this, the scripts are modified to consider that
previous branch is now queens, not pike.

Change-Id: I0c1d6298cd394426b6e4acbc1859c901fdd80439
Co-Authored-By: Jean-Philippe Evrard <jean-philippe@evrard.me>
---
 tests/ansible-role-requirements.yml      | 2 +-
 tests/test-neutron-resources-upgrade.yml | 3 +++
 tests/tests-repo-clone.sh                | 2 +-
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/tests/ansible-role-requirements.yml b/tests/ansible-role-requirements.yml
index 0ef8caaa..f7690947 100644
--- a/tests/ansible-role-requirements.yml
+++ b/tests/ansible-role-requirements.yml
@@ -57,7 +57,7 @@
 - name: os_previous_neutron
   src: https://git.openstack.org/openstack/openstack-ansible-os_neutron
   scm: git
-  version: stable/pike
+  version: stable/queens
 - name: opendaylight
   scm: git
   src: https://github.com/opendaylight/integration-packaging-ansible-opendaylight
diff --git a/tests/test-neutron-resources-upgrade.yml b/tests/test-neutron-resources-upgrade.yml
index 778a8ea7..6b340a51 100644
--- a/tests/test-neutron-resources-upgrade.yml
+++ b/tests/test-neutron-resources-upgrade.yml
@@ -25,6 +25,9 @@
       - "python-glanceclient"
       - "openstacksdk"
   tasks:
+    - name: Lay clouds.yaml
+      include_role:
+        name: openstack_openrc
     - name: Install openstack sdk
       pip:
         name: "{{ upgrade_test_packages }}"
diff --git a/tests/tests-repo-clone.sh b/tests/tests-repo-clone.sh
index 3e4ffd66..5ad509c5 100755
--- a/tests/tests-repo-clone.sh
+++ b/tests/tests-repo-clone.sh
@@ -110,7 +110,7 @@ fi
 # tests repo are not supported.
 if [[ "${CLONE_UPGRADE_TESTS}" == "yes" ]]; then
     if [[ ! -d "${WORKING_DIR}/tests/common/previous" ]]; then
-        git clone -b stable/pike \
+        git clone -b stable/queens \
             https://git.openstack.org/openstack/openstack-ansible-tests \
             ${WORKING_DIR}/tests/common/previous
   fi