From bcfaf81332ef1414da6deab4027d4d5ebc196e21 Mon Sep 17 00:00:00 2001
From: Gael Chamoulaud <gchamoul@redhat.com>
Date: Fri, 18 Oct 2019 12:40:19 +0200
Subject: [PATCH] Add workaround for the ansible-lint installation failure

https://bugs.launchpad.net/tripleo/+bug/1848512

Change-Id: I0d19327a576646e40228b3e622280501c3b9e229
Signed-off-by: Gael Chamoulaud <gchamoul@redhat.com>
---
 .pre-commit-config.yaml | 4 ++--
 tox.ini                 | 4 +++-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index d4bff11d7..6203e5440 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -1,7 +1,7 @@
 ---
 repos:
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v2.1.0
+    rev: v2.3.0
     hooks:
       - id: end-of-file-fixer
       - id: trailing-whitespace
@@ -22,7 +22,7 @@ repos:
         types: [file, yaml]
         entry: yamllint --strict -f parsable
   - repo: https://github.com/ansible/ansible-lint
-    rev: v4.1.0a0
+    rev: v4.1.1a0
     hooks:
       - id: ansible-lint
         files: \.(yaml|yml)$
diff --git a/tox.ini b/tox.ini
index de9b5a221..24d9aef82 100644
--- a/tox.ini
+++ b/tox.ini
@@ -5,7 +5,7 @@ skipdist = True
 
 [testenv]
 usedevelop = True
-install_command = pip install -c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master} {opts} {packages}
+install_command = pip install {opts} {packages}
 passenv = *
 setenv =
   VIRTUAL_ENV={envdir}
@@ -82,6 +82,8 @@ commands =
 
 [testenv:linters]
 deps =
+    # workaround for https://github.com/ansible/ansible-lint/issues/590
+    virtualenv==16.3.0 # 16.7.6 not working
     -r {toxinidir}/requirements.txt
     -r {toxinidir}/test-requirements.txt
     -r {toxinidir}/molecule-requirements.txt