From 1f3417cdef4b55fa6cfb241815a2531358fa286f Mon Sep 17 00:00:00 2001 From: Sagi Shnaidman Date: Sun, 26 Jul 2020 09:32:04 +0300 Subject: [PATCH] Temporarly disable check-import check-import has ansible as a dependency, which installs only 2.9 ansible version and it conflicts with higher ansible versions Issue to check-import will be submitted to have ansible-test as a dep. Change-Id: Ide46a8a6b45677e82e57eb6a4c5dfe412d7b37fd --- test-requirements-2.9.txt | 2 +- test-requirements.txt | 2 +- tools/check-import.sh | 9 +++++---- tox.ini | 1 - 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/test-requirements-2.9.txt b/test-requirements-2.9.txt index 06c66dee..b657ee88 100644 --- a/test-requirements-2.9.txt +++ b/test-requirements-2.9.txt @@ -7,5 +7,5 @@ voluptuous yamllint rstcheck ruamel.yaml -galaxy-importer +#galaxy-importer # see https://review.opendev.org/#/c/743054 tox diff --git a/test-requirements.txt b/test-requirements.txt index 99801611..cf2f8264 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -7,5 +7,5 @@ voluptuous yamllint rstcheck ruamel.yaml -galaxy-importer +#galaxy-importer # see https://review.opendev.org/#/c/743054 tox diff --git a/tools/check-import.sh b/tools/check-import.sh index af4caf5c..cc738162 100755 --- a/tools/check-import.sh +++ b/tools/check-import.sh @@ -16,9 +16,10 @@ 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 +#output=$(python -m galaxy_importer.main $TOXDIR/build_artifact/*) +#if echo $output | grep ERROR: ; then +# exit 1 +#fi diff --git a/tox.ini b/tox.ini index 4ce1077f..157683f5 100644 --- a/tox.ini +++ b/tox.ini @@ -38,7 +38,6 @@ commands = deps = pbr ruamel.yaml - galaxy-importer ansible-base commands =