From 82659a89a756788e7373dadd04dd964a48f7151a Mon Sep 17 00:00:00 2001
From: Alex Schultz <aschultz@redhat.com>
Date: Mon, 14 Dec 2020 08:49:19 -0700
Subject: [PATCH] Fix ci issues

1) Drop tripleo-common constraint

The new pip dependency resolver doesn't work well with links. See pip
issue #8253.  Also we should require a release of tripleo-common for CI
to function. This is similar to what we do with tripleoclient. This
change also bumps the lower bound for tripleo-common to the latest for
master which is 13.0.0. This should be adjusted for backports.

2) Exclude reqs and tox files from modules job temporarly, will be
fixed in next patch

Change-Id: I1363d911a39e4072a706c61d83d113db6f85f71c
Closes-Bug: #1908079
---
 ansible-requirements.txt  |  2 +-
 constraints.txt           |  1 -
 molecule-requirements.txt |  2 +-
 requirements.txt          |  2 +-
 tox.ini                   | 11 +++--------
 zuul.d/layout.yaml        |  4 +++-
 zuul.d/molecule.yaml      |  2 --
 7 files changed, 9 insertions(+), 15 deletions(-)
 delete mode 100644 constraints.txt

diff --git a/ansible-requirements.txt b/ansible-requirements.txt
index a021f403e..55c663302 100644
--- a/ansible-requirements.txt
+++ b/ansible-requirements.txt
@@ -1,4 +1,4 @@
 ansible>=2.8,!=2.8.9,!=2.9.12,<2.10.0
 metalsmith>=1.2.0 # Apache-2.0
-importlib-metadata<2.0.0
+importlib-metadata
 jsonschema  # MIT
diff --git a/constraints.txt b/constraints.txt
deleted file mode 100644
index 47a7105fb..000000000
--- a/constraints.txt
+++ /dev/null
@@ -1 +0,0 @@
--e git+https://github.com/openstack/tripleo-common@master#egg=tripleo-common
diff --git a/molecule-requirements.txt b/molecule-requirements.txt
index cbf531e5e..e14ab83af 100644
--- a/molecule-requirements.txt
+++ b/molecule-requirements.txt
@@ -1,7 +1,7 @@
 # this is required for the molecule jobs
 ansi2html
 # https://github.com/sqlalchemy/dogpile.cache/issues/178 (openstacksdk)
-dogpile.cache>=0.6.5,<0.9.1  # MIT
+dogpile.cache>=0.6.5,!=0.9.1  # MIT
 openstacksdk
 pytest
 pytest-cov
diff --git a/requirements.txt b/requirements.txt
index f60cc444a..30694ca8a 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,5 +1,5 @@
 pbr>=1.6
-tripleo-common>=11.3.1 # Apache-2.0
+tripleo-common  # Apache-2.0
 python-glanceclient>=2.8.0 # Apache-2.0
 python-heatclient  # Apache-2.0
 python-ironicclient!=2.5.2,!=2.7.1,!=3.0.0,>=2.3.0,<4.0.0;python_version=='2.7' # Apache-2.0
diff --git a/tox.ini b/tox.ini
index bc7e97630..d4f7c9304 100644
--- a/tox.ini
+++ b/tox.ini
@@ -5,7 +5,7 @@ skipdist = True
 
 [testenv]
 usedevelop = True
-install_command = python3 -m pip install -c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master} -c{toxinidir}/constraints.txt {opts} {packages}
+install_command = python3 -m pip install -c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master} {opts} {packages}
 passenv = *
 setenv =
   ANSIBLE_ACTION_PLUGINS={toxinidir}/tripleo_ansible/roles.galaxy/config_template/action:{toxinidir}/tripleo_ansible/ansible_plugins/action
@@ -49,8 +49,8 @@ sitepackages = False
 setenv =
   TOX_CONSTRAINTS_FILE=file:///dev/null
 deps =
-    pre-commit>=2.7.1
-    virtualenv>=20.0.31
+    pre-commit
+    virtualenv
     -r  {toxinidir}/ansible-requirements.txt
 commands =
     pip check
@@ -72,11 +72,6 @@ deps =
   -c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
   -r {toxinidir}/doc/requirements.txt
 commands=
-    # NOTE(cloudnull): This will ensure we always have the latest version of
-    #                  tripleo-common installed, which is required for documentation
-    #                  to build when running with in development modules which use
-    #                  tripleo-common as a library.
-    pip install tripleo-common -c{toxinidir}/constraints.txt --force --upgrade
     doc8 doc
     sphinx-build -a -E -W -d doc/build/doctrees --keep-going -b html doc/source doc/build/html -T
 
diff --git a/zuul.d/layout.yaml b/zuul.d/layout.yaml
index 6da5d08d9..662284fdb 100644
--- a/zuul.d/layout.yaml
+++ b/zuul.d/layout.yaml
@@ -6,7 +6,9 @@
     - openstack-python3-wallaby-jobs
     check:
       jobs:
-      - tripleo-ci-centos-8-content-provider
+      - tripleo-ci-centos-8-content-provider:
+          irrelevant-files:
+          - ^tox.ini$
       - openstack-tox-linters: &tripleo-linters
           nodeset: centos-8
       - openstack-tox-docs: &tripleo-docs
diff --git a/zuul.d/molecule.yaml b/zuul.d/molecule.yaml
index 6b168a8f5..1eed1c9c9 100644
--- a/zuul.d/molecule.yaml
+++ b/zuul.d/molecule.yaml
@@ -203,8 +203,6 @@
 - job:
     files:
     - ^tripleo_ansible/ansible_plugins/.*$
-    - ^tox.ini
-    - ^molecule-requirements.txt
     name: tripleo-ansible-centos-8-molecule-tripleo-modules
     parent: tripleo-ansible-centos-8-base
 - job: