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] 1f3417cdef
[2] 4f5fd0f29c
[3] 9893354783

Change-Id: I898149727d80cd7effe6a04ca77a13ef1774e781
This commit is contained in:
Jakob Meng 2022-03-25 10:53:12 +01:00
parent 749f04bcfb
commit 938abd0d84
6 changed files with 15 additions and 12 deletions

View File

@ -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

View File

@ -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

View File

@ -7,5 +7,5 @@ voluptuous
yamllint
rstcheck
ruamel.yaml
#galaxy-importer # see https://review.opendev.org/#/c/743054
galaxy-importer
tox

View File

@ -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

View File

@ -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/"*

View File

@ -36,6 +36,7 @@ commands =
deps =
pbr
ruamel.yaml
galaxy-importer
ansible-core
commands =