From 32cc3579c27b9f7bae73973f4491aa9ea011a0a7 Mon Sep 17 00:00:00 2001
From: "Jesse Pretorius (odyssey4me)" <jesse@odyssey4.me>
Date: Mon, 22 Jun 2020 14:12:26 +0100
Subject: [PATCH] [tests] Remove pip and install virtualenv instead

We don't need pip for tests, only virtualenv. We therefore
replace the implementation to install and use virtualenv.

Change-Id: I88fc54769eff51cf07bc4496dc2a9aa538af5bb4
(cherry picked from commit b6babcfc807e6a9dca1581269bcdde1c5d1f59f7)
---
 zuul.d/playbooks/pre.yml | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/zuul.d/playbooks/pre.yml b/zuul.d/playbooks/pre.yml
index 2baa3fb6..d4f232e9 100644
--- a/zuul.d/playbooks/pre.yml
+++ b/zuul.d/playbooks/pre.yml
@@ -19,15 +19,14 @@
         path: "{{ ansible_user_dir }}/zuul-output/logs"
         state: directory
 
-    - name: Ensure pip is available
+    - name: Ensure virtualenv is available
       include_role:
-        name: ensure-pip
+        name: ensure-virtualenv
 
     - name: Setup bindep
       pip:
         name: "bindep"
         virtualenv: "{{ ansible_user_dir }}/test-python"
-        virtualenv_command: "{{ ensure_pip_virtualenv_command }}"
         virtualenv_site_packages: true
 
     - name: Run bindep
@@ -40,7 +39,6 @@
       pip:
         requirements: "{{ tripleo_upgrade_project_path }}/molecule/molecule-requirements.txt"
         virtualenv: "{{ ansible_user_dir }}/test-python"
-        virtualenv_command: "{{ ensure_pip_virtualenv_command }}"
         virtualenv_site_packages: true
 
     - name: Change role requirements to use zuul sources, if any are available