From 712a9078da86d237e8f088463b00782b2cdf77b4 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Evrard <jean-philippe@evrard.me>
Date: Fri, 19 Jan 2018 14:45:35 +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: Ib3d3d14a3a6222f4362def29b4765cf5bad3d285
---
 tests/test-neutron-resources-upgrade.yml | 26 ++++++++++++++++++------
 1 file changed, 20 insertions(+), 6 deletions(-)

diff --git a/tests/test-neutron-resources-upgrade.yml b/tests/test-neutron-resources-upgrade.yml
index 14d53a86..778a8ea7 100644
--- a/tests/test-neutron-resources-upgrade.yml
+++ b/tests/test-neutron-resources-upgrade.yml
@@ -19,18 +19,32 @@
   become: true
   vars:
     working_dir: "{{ lookup('env', 'WORKING_DIR') }}"
+    upgrade_venv_folder: "/openstack/venvs/upgrades"
+    upgrade_test_packages:
+      - "python-keystoneclient"
+      - "python-glanceclient"
+      - "openstacksdk"
   tasks:
     - name: Install openstack sdk
       pip:
-        name: "{{ item }}"
-      with_items:
-        - "python-openstacksdk"
-        - "python-keystoneclient"
-        - "python-glanceclient"
+        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 neutron
+      shell: |
+        source {{ upgrade_venv_folder }}/bin/activate
+        ./openstack-ansible-ops/bowling_ball/rolling_tests.py neutron
       args:
         chdir: "{{ working_dir }}"
+        executable: /bin/bash
       async: 100000
       poll: 0
       environment: