From 938abd0d84baa6591e09d8a83d91432c50397bba Mon Sep 17 00:00:00 2001
From: Jakob Meng <code@jakobmeng.de>
Date: Fri, 25 Mar 2022 10:53:12 +0100
Subject: [PATCH] Reenabled check-import.sh which tests imports to Ansible
 Galaxy

Reverted commit 1f3417cdef [1] which disabled check-import.sh script.
Python module galaxy_importer will return a non-zero return value on
errors since commit 4f5fd0f29c [2].

Use galaxy-importer 0.3.1 for Ansible 2.9 and galaxy-importer 0.3.2
for later Ansible releases because galaxy-importer moved from ansible
2.9 to ansible-core 2.11 in 0.3.2 [3].

Ref.:
[1] https://opendev.org/openstack/ansible-collections-openstack/commit/1f3417cdef4b55fa6cfb241815a2531358fa286f
[2] https://github.com/ansible/galaxy-importer/commit/4f5fd0f29c30c354cd92837ac71109abc0b48082
[3] https://github.com/ansible/galaxy-importer/commit/98933547831922c45243f39d85eefe150b55fc36

Change-Id: I898149727d80cd7effe6a04ca77a13ef1774e781
---
 .zuul.yaml                 |  6 ++++++
 test-requirements-2.11.txt |  4 ++--
 test-requirements-2.12.txt |  2 +-
 test-requirements-2.9.txt  |  4 +++-
 tools/check-import.sh      | 10 ++--------
 tox.ini                    |  1 +
 6 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/.zuul.yaml b/.zuul.yaml
index ff229ebb..1df46c83 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -457,6 +457,8 @@
       - name: github.com/ansible/ansible
         override-checkout: devel
     vars:
+      # override tox_constraints_file from parent job
+      tox_constraints_file: '{{ ansible_user_dir }}/{{ zuul.project.src_dir }}/tests/pip-constraints-none.txt'
       tox_envlist: linters-2.12
       python_version: 3.8
       bindep_profile: test py38
@@ -471,6 +473,8 @@
       - name: github.com/ansible/ansible
         override-checkout: stable-2.12
     vars:
+      # override tox_constraints_file from parent job
+      tox_constraints_file: '{{ ansible_user_dir }}/{{ zuul.project.src_dir }}/tests/pip-constraints-none.txt'
       tox_envlist: linters-2.12
       python_version: 3.8
       bindep_profile: test py38
@@ -485,6 +489,8 @@
       - name: github.com/ansible/ansible
         override-checkout: stable-2.9
     vars:
+      # override tox_constraints_file from parent job
+      tox_constraints_file: '{{ ansible_user_dir }}/{{ zuul.project.src_dir }}/tests/pip-constraints-none.txt'
       tox_envlist: linters-2.9
 
 # Cross-checks with other projects
diff --git a/test-requirements-2.11.txt b/test-requirements-2.11.txt
index ff1a34e7..1517a33a 100644
--- a/test-requirements-2.11.txt
+++ b/test-requirements-2.11.txt
@@ -1,5 +1,5 @@
 openstacksdk
-ansible-core
+ansible-core>=2.11.0,<2.12.0
 pycodestyle
 flake8
 pylint
@@ -7,5 +7,5 @@ voluptuous
 yamllint
 rstcheck
 ruamel.yaml
-#galaxy-importer  # see https://review.opendev.org/#/c/743054
+galaxy-importer
 tox
diff --git a/test-requirements-2.12.txt b/test-requirements-2.12.txt
index ff1a34e7..bd77fad5 100644
--- a/test-requirements-2.12.txt
+++ b/test-requirements-2.12.txt
@@ -7,5 +7,5 @@ voluptuous
 yamllint
 rstcheck
 ruamel.yaml
-#galaxy-importer  # see https://review.opendev.org/#/c/743054
+galaxy-importer
 tox
diff --git a/test-requirements-2.9.txt b/test-requirements-2.9.txt
index 08007a64..a548e7bf 100644
--- a/test-requirements-2.9.txt
+++ b/test-requirements-2.9.txt
@@ -7,5 +7,7 @@ voluptuous
 yamllint
 rstcheck
 ruamel.yaml
-#galaxy-importer  # see https://review.opendev.org/#/c/743054
+# galaxy-importer 0.3.2 moved from ansible 2.9 to ansible-core 2.11
+# Ref.: https://github.com/ansible/galaxy-importer/commit/98933547831922c45243f39d85eefe150b55fc36
+galaxy-importer==0.3.1
 tox
diff --git a/tools/check-import.sh b/tools/check-import.sh
index cc738162..939c1a50 100755
--- a/tools/check-import.sh
+++ b/tools/check-import.sh
@@ -15,11 +15,5 @@
 
 set -e
 
-TOXDIR=${1:-.}
-######### Disbaled in https://review.opendev.org/#/c/743054
-
-# galaxy_importer.main does not return non-zero error code on error
-#output=$(python -m galaxy_importer.main $TOXDIR/build_artifact/*)
-#if echo $output | grep ERROR: ; then
-#    exit 1
-#fi
+TOXDIR="${1:-.}"
+python -m galaxy_importer.main "$TOXDIR/build_artifact/"*
diff --git a/tox.ini b/tox.ini
index 5ed80b98..8e83e1f6 100644
--- a/tox.ini
+++ b/tox.ini
@@ -36,6 +36,7 @@ commands =
 deps =
     pbr
     ruamel.yaml
+    galaxy-importer
     ansible-core
 
 commands =