From f482d7a6a68f8dfbd5259fca15fdeafd5f17a29d Mon Sep 17 00:00:00 2001
From: Sorin Sbarnea <ssbarnea@redhat.com>
Date: Wed, 18 Aug 2021 15:35:46 +0100
Subject: [PATCH] Make ansible-test sanity voting

- symlink sanity ignore files
- exclude tests/unit from collection as they were causing multiple
  violations on sanity
- remove README.rst from collections as they can only have the README.md
- make sanity job voting to prevent regressions

Change-Id: Ifad87a22bec86734e9db4270f4de368ca91b1f67
---
 galaxy.yml                   | 3 ++-
 tests/sanity/ignore-2.10.txt | 2 +-
 tests/sanity/ignore-2.11.txt | 2 +-
 tests/sanity/ignore-2.12.txt | 1 +
 tests/sanity/ignore-2.9.txt  | 2 +-
 tests/sanity/ignore.txt      | 1 +
 zuul.d/layout.yaml           | 6 ++----
 7 files changed, 9 insertions(+), 8 deletions(-)
 create mode 120000 tests/sanity/ignore-2.12.txt
 mode change 100644 => 120000 tests/sanity/ignore-2.9.txt
 create mode 100644 tests/sanity/ignore.txt

diff --git a/galaxy.yml b/galaxy.yml
index 0f3f456..bc4df7e 100644
--- a/galaxy.yml
+++ b/galaxy.yml
@@ -24,7 +24,8 @@ build_ignore:
   - report.html
   - setup.cfg
   - setup.py
-  - tests
+  - "tests/unit/*.*"
+  - README.rst
   - tox.ini
   - tripleo_repos
   - zuul.d
diff --git a/tests/sanity/ignore-2.10.txt b/tests/sanity/ignore-2.10.txt
index a11c71b..f749b40 120000
--- a/tests/sanity/ignore-2.10.txt
+++ b/tests/sanity/ignore-2.10.txt
@@ -1 +1 @@
-ignore-2.9.txt
\ No newline at end of file
+ignore.txt
\ No newline at end of file
diff --git a/tests/sanity/ignore-2.11.txt b/tests/sanity/ignore-2.11.txt
index a11c71b..f749b40 120000
--- a/tests/sanity/ignore-2.11.txt
+++ b/tests/sanity/ignore-2.11.txt
@@ -1 +1 @@
-ignore-2.9.txt
\ No newline at end of file
+ignore.txt
\ No newline at end of file
diff --git a/tests/sanity/ignore-2.12.txt b/tests/sanity/ignore-2.12.txt
new file mode 120000
index 0000000..f749b40
--- /dev/null
+++ b/tests/sanity/ignore-2.12.txt
@@ -0,0 +1 @@
+ignore.txt
\ No newline at end of file
diff --git a/tests/sanity/ignore-2.9.txt b/tests/sanity/ignore-2.9.txt
deleted file mode 100644
index 36851b3..0000000
--- a/tests/sanity/ignore-2.9.txt
+++ /dev/null
@@ -1 +0,0 @@
-plugins/module_utils/tripleo_repos/get_hash/tripleo_hash_info.py replace-urlopen  # we did it right
diff --git a/tests/sanity/ignore-2.9.txt b/tests/sanity/ignore-2.9.txt
new file mode 120000
index 0000000..f749b40
--- /dev/null
+++ b/tests/sanity/ignore-2.9.txt
@@ -0,0 +1 @@
+ignore.txt
\ No newline at end of file
diff --git a/tests/sanity/ignore.txt b/tests/sanity/ignore.txt
new file mode 100644
index 0000000..d5783bc
--- /dev/null
+++ b/tests/sanity/ignore.txt
@@ -0,0 +1 @@
+plugins/module_utils/tripleo_repos/get_hash/tripleo_hash_info.py replace-urlopen
diff --git a/zuul.d/layout.yaml b/zuul.d/layout.yaml
index 2f11433..ed1979f 100644
--- a/zuul.d/layout.yaml
+++ b/zuul.d/layout.yaml
@@ -29,10 +29,8 @@
               - openstack-tox-py39
         - tripleo-build-containers-ubi-8:
             dependencies: *deps_unit_lint_cprovider
-        - tox-sanity-py36:
-            voting: false
-        - tox-sanity-py39:
-            voting: false
+        - tox-sanity-py36
+        - tox-sanity-py39
     gate:
       jobs:
         - openstack-tox-pep8: