From f407d7a15cb75d12fc4698a5a16218827773eae0 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Evrard <jean-philippe@evrard.me>
Date: Fri, 19 Jan 2018 14:50:24 +0000
Subject: [PATCH] Fix upgrade test

openstacksdk was updated to 0.10.0 which has a different
connection.Connection object, which doesn't take our auth_url.

We should respect the constraints, install the tooling in a venv,
and restrict to a known version of the sdk until more robust code
is written.

Change-Id: I0a8a5ac589b121e3a3ee98979c53340a1467f45c
(cherry picked from commit ce44dc6a08698aa91800e2962f866b1b94420ece)
---
 tests/test-glance-resources-upgrade.yml | 26 +++++++++++++++++++------
 1 file changed, 20 insertions(+), 6 deletions(-)

diff --git a/tests/test-glance-resources-upgrade.yml b/tests/test-glance-resources-upgrade.yml
index 21bb94ab..0d6c5b4c 100644
--- a/tests/test-glance-resources-upgrade.yml
+++ b/tests/test-glance-resources-upgrade.yml
@@ -21,18 +21,32 @@
   vars:
     test_keystone_host: openstack1
     working_dir: "{{ lookup('env', 'WORKING_DIR') }}"
+    upgrade_venv_folder: "/openstack/venvs/upgrades"
+    upgrade_test_packages:
+      - "python-keystoneclient"
+      - "python-glanceclient"
+      - "openstacksdk"
   tasks:
     - name: Install openstack clients
       pip:
-        name: "{{ item }}"
-      with_items:
-        - python-glanceclient
-        - python-keystoneclient
-        - python-openstacksdk
+        name: "{{ upgrade_test_packages }}"
+        virtualenv: "{{ upgrade_venv_folder }}"
+        virtualenv_site_packages: "no"
+        extra_args: >-
+          {{ (pip_install_upper_constraints is defined) | ternary('--constraint ' + pip_install_upper_constraints | default(''),'') }}
+          {{ pip_install_options | default('') }}
+      register: install_packages
+      until: install_packages | success
+      retries: 5
+      delay: 2
+
     - name: Run rolling test script
-      command: ./openstack-ansible-ops/bowling_ball/rolling_tests.py glance
+      shell: |
+        source {{ upgrade_venv_folder }}/bin/activate
+        ./openstack-ansible-ops/bowling_ball/rolling_tests.py glance
       args:
         chdir: "{{ working_dir }}"
+        executable: /bin/bash
       async: 100000
       poll: 0
       environment: