diff --git a/output/elastic-recheck/1943170.yaml b/output/elastic-recheck/1945926.yaml similarity index 100% rename from output/elastic-recheck/1943170.yaml rename to output/elastic-recheck/1945926.yaml diff --git a/output/sova-pattern-generated.json b/output/sova-pattern-generated.json index 9131672..eb3a99e 100644 --- a/output/sova-pattern-generated.json +++ b/output/sova-pattern-generated.json @@ -1393,7 +1393,10 @@ }, { "name": "conflict_dependencies", - "regex": "ERROR: Cannot install -r .* because these package versions have conflicting dependencies" + "regex": [ + "ERROR: Cannot install -r .* because these package versions have conflicting dependencies", + "Cannot install networkx>=2.4.0 because these package versions have conflicting dependencies" + ] } ] } diff --git a/requirements.txt b/requirements.txt index c103b08..6770c9c 100644 --- a/requirements.txt +++ b/requirements.txt @@ -44,7 +44,7 @@ distro==1.5.0 # via lazr.restfulclient docutils==0.17.1 # via python-daemon -git+https://opendev.org/opendev/elastic-recheck.git#egg=elastic-recheck +git+https://opendev.org/opendev/elastic-recheck.git@rdo#egg=elastic-recheck # via -r requirements.in extras==1.0.0 # via diff --git a/src/data/queries.yml b/src/data/queries.yml index 2bacc16..ad700eb 100644 --- a/src/data/queries.yml +++ b/src/data/queries.yml @@ -739,6 +739,8 @@ queries: pattern: - "ERROR: Cannot install -r" - "because these package versions have conflicting dependencies." - regex: "ERROR: Cannot install -r .* because these package versions have conflicting dependencies" + regex: + - "ERROR: Cannot install -r .* because these package versions have conflicting dependencies" + - "Cannot install networkx>=2.4.0 because these package versions have conflicting dependencies" sova_tag: console - url: https://bugs.launchpad.net/tripleo/+bug/1943170 + url: https://bugs.launchpad.net/tripleo/+bug/1945926 diff --git a/tox.ini b/tox.ini index a01a73a..707b4f4 100644 --- a/tox.ini +++ b/tox.ini @@ -19,11 +19,12 @@ deps = commands = python3 src/model.py bash -c "cat src/data/queries.yml | yq | jsonschema -i /dev/stdin output/queries-schema.json" - python3 src/sova-converter.py ansible-galaxy collection install -r requirements.yml - ansible-playbook -v playbooks/sova.yml python3 src/er-converter.py + python3 src/sova-converter.py ansible-playbook playbooks/er.yml + ansible-playbook -v playbooks/sova.yml + passenv = CURL_CA_BUNDLE # https proxies, https://github.com/tox-dev/tox/issues/1437 FORCE_COLOR