From cc3f50ba85cbe02df5ebc4111631d82baea8fe73 Mon Sep 17 00:00:00 2001
From: "Chandan Kumar (raukadah)" <chkumar@redhat.com>
Date: Fri, 25 Mar 2022 15:08:17 +0530
Subject: [PATCH] Put setup.* file under irrelevant files

https://opendev.org/openstack/tripleo-ci/src/branch/master/zuul.d/base-upstream.yaml#L92
adds  ^setup.*$ under irrelevant-files and content-provider is parent
from tripleo-ci-base-standalone-standard and which parents from
tripleo-ci-base-standard.

Since setup.* files under irrelevant files so content provider will
not run and undercloud, upgrade and standalone job depends on that.

It leads to job freeze issue. Putting setup files under
irrelevant files fixes the issue.

Disable auto discovery as a workaround to fix
setuptools 61.0 issue[1]

[1]. https://github.com/pypa/setuptools/issues/3197
Related-Bug: #1966382


Signed-off-by: Chandan Kumar (raukadah) <chkumar@redhat.com>
Change-Id: I43b88e356e1f6823f9febe47e9753cf3e5b176c6
---
 setup.py                            | 2 +-
 zuul.d/multinode-jobs.yaml          | 2 +-
 zuul.d/standalone-jobs.yaml         | 1 +
 zuul.d/undercloud-jobs.yaml         | 1 +
 zuul.d/upgrades-jobs-templates.yaml | 3 ++-
 5 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/setup.py b/setup.py
index 0eb162109..dca5e3663 100644
--- a/setup.py
+++ b/setup.py
@@ -17,4 +17,4 @@
 # THIS FILE IS MANAGED BY THE GLOBAL REQUIREMENTS REPO - DO NOT EDIT
 import setuptools
 
-setuptools.setup(setup_requires=['pbr'], pbr=True)
+setuptools.setup(setup_requires=['pbr'], pbr=True, py_modules=[])
diff --git a/zuul.d/multinode-jobs.yaml b/zuul.d/multinode-jobs.yaml
index 237ae8530..322868ed6 100644
--- a/zuul.d/multinode-jobs.yaml
+++ b/zuul.d/multinode-jobs.yaml
@@ -81,7 +81,7 @@
               - ^roles/build-containers/.*$
               - ^roles/oooci-build-images/.*$
               - ^roles/tripleo-repos/.*$
-              - setup.cfg
+              - ^setup.*$
               - ^spec/.*$
               - ^vars/sova-patterns.yml$
               - playbooks/quickstart-extras-standalone.yml  # tripleo-quickstart-extras
diff --git a/zuul.d/standalone-jobs.yaml b/zuul.d/standalone-jobs.yaml
index 9977123be..ed1cdda56 100644
--- a/zuul.d/standalone-jobs.yaml
+++ b/zuul.d/standalone-jobs.yaml
@@ -67,6 +67,7 @@
       - ^test-requirements.txt$
       - ^vars/sova-patterns.yml$
       - tox.ini
+      - ^setup.*$
       - ^scripts/.*
       # like parent but with requirements.txt and setup.py removed
 
diff --git a/zuul.d/undercloud-jobs.yaml b/zuul.d/undercloud-jobs.yaml
index f1a40e308..36f28655c 100644
--- a/zuul.d/undercloud-jobs.yaml
+++ b/zuul.d/undercloud-jobs.yaml
@@ -23,6 +23,7 @@
               - ^spec/.*$
               - ^Puppetfile.*$
               - tox.ini
+              - ^setup.*$
               - ^roles/build-containers/.*$
               - ^roles/oooci-build-images/.*$
               - ^roles/tripleo-repos/.*$
diff --git a/zuul.d/upgrades-jobs-templates.yaml b/zuul.d/upgrades-jobs-templates.yaml
index eccf011b3..8a74e267a 100644
--- a/zuul.d/upgrades-jobs-templates.yaml
+++ b/zuul.d/upgrades-jobs-templates.yaml
@@ -17,7 +17,7 @@
               - ^metadata.json$
               - ^releasenotes/.*$
               - ^test-requirements.txt$
-              - setup.cfg
+              - ^setup.*$
               - ^spec/.*$
               - ^Puppetfile.*$
               - tox.ini
@@ -58,6 +58,7 @@
               - ^spec/.*$
               - ^Puppetfile.*$
               - tox.ini
+              - ^setup.*$
               - ^roles/build-containers/.*$
               - ^roles/oooci-build-images/.*$
               - ^playbooks/deprecated/.*$