From ecf59118d73d49eee130e810ea742c0191ae1775 Mon Sep 17 00:00:00 2001
From: Lee Yarwood <lyarwood@redhat.com>
Date: Mon, 21 Dec 2020 19:05:55 +0000
Subject: [PATCH] Stop installing test-requirements with projects

This is a test of installing openstack and then seeing if it works.
OpenStack components do not need test-requirements to operate,
that's why they are test-requirements.

Additionally, as we look forward to depsolver pip, this is going
to screw us because we don't apply constraints to linters, which
are expressed in - you guessed it, test-requirements.

NOTE(lyarwood): openstacksdk-functional is currently failing due to
I1e151454f39d51db52cdc7a23dbdcbf9b28c9381 not being present in
stable/train. Unfortunatley the backport of this fix is held up by
multiple other failures in other projects caused by the new pip
dependency resolver behaviour. To fix these we first need to land
I8f24b839bf42e2fb9803dc7df3a30ae20cf264eb in devstack on stable/train,
allowing fixes to land in these projects that should eventually fix
openstacksdk.

To allow this we need to temporarily mark the openstacksdk-functional
job as non-voting.

Change-Id: I8f24b839bf42e2fb9803dc7df3a30ae20cf264eb
(cherry picked from commit 09b5b05c471985ad53c4b321e993101f007ee915)
---
 .zuul.yaml | 9 +++++----
 inc/python | 9 +--------
 2 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/.zuul.yaml b/.zuul.yaml
index b7f6dcc354..fcdfd0442a 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -645,6 +645,7 @@
             irrelevant-files:
               - ^.*\.rst$
               - ^doc/.*$
+            voting: false
         - tempest-ipv6-only:
             irrelevant-files:
               - ^.*\.rst$
@@ -674,10 +675,10 @@
         #     irrelevant-files:
         #       - ^.*\.rst$
         #       - ^doc/.*$
-        - openstacksdk-functional-devstack:
-            irrelevant-files:
-              - ^.*\.rst$
-              - ^doc/.*$
+        # - openstacksdk-functional-devstack:
+        #     irrelevant-files:
+        #       - ^.*\.rst$
+        #       - ^doc/.*$
         - tempest-ipv6-only:
             irrelevant-files:
               - ^.*\.rst$
diff --git a/inc/python b/inc/python
index 286e5d4f80..ed25fab23a 100644
--- a/inc/python
+++ b/inc/python
@@ -276,13 +276,6 @@ function pip_install {
 
     $xtrace
 
-    # Also install test requirements
-    local install_test_reqs=""
-    local test_req="${package_dir}/test-requirements.txt"
-    if [[ -e "$test_req" ]]; then
-        install_test_reqs="-r $test_req"
-    fi
-
     # adding SETUPTOOLS_SYS_PATH_TECHNIQUE is a workaround to keep
     # the same behaviour of setuptools before version 25.0.0.
     # related issue: https://github.com/pypa/pip/issues/3874
@@ -292,7 +285,7 @@ function pip_install {
         no_proxy="${no_proxy:-}" \
         PIP_FIND_LINKS=$PIP_FIND_LINKS \
         SETUPTOOLS_SYS_PATH_TECHNIQUE=rewrite \
-        $cmd_pip $upgrade $install_test_reqs \
+        $cmd_pip $upgrade \
         $@
     result=$?