From: Guillaume Abrioux <gabrioux@redhat.com>
Date: Tue, 15 Feb 2022 17:09:03 +0000 (+0100)
Subject: cephadm/tests: decrease number of docker.io occurances
X-Git-Tag: v18.0.0~699^2
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=409105d7f06e86e5d220857b861ffdaa0ded44dc;p=ceph.git

cephadm/tests: decrease number of docker.io occurances

with haproxy/keepalived default images change, this check needs to be updated.

Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>
---

diff --git a/src/cephadm/tox.ini b/src/cephadm/tox.ini
index 4f8d3d7af2269..095bced7a74fe 100644
--- a/src/cephadm/tox.ini
+++ b/src/cephadm/tox.ini
@@ -41,7 +41,7 @@ commands=pytest {posargs}
 
 [testenv:mypy]
 basepython = python3
-deps = 
+deps =
     mypy
     -c{toxinidir}/../mypy-constrains.txt
 commands = mypy --config-file ../mypy.ini {posargs:cephadm}
@@ -62,6 +62,6 @@ deps =
     flake8-quotes
 commands =
     flake8 --config=tox.ini {posargs:cephadm}
-    bash -c "test $(grep 'docker.io' cephadm | wc -l) == 13"
+    bash -c "test $(grep 'docker.io' cephadm | wc -l) == 11"
 # Downstream distributions may choose to alter this "docker.io" number,
 # to make sure no new references to docker.io are creeping in unnoticed.
diff --git a/src/pybind/mgr/tox.ini b/src/pybind/mgr/tox.ini
index ea69889e31800..7d172847f159a 100644
--- a/src/pybind/mgr/tox.ini
+++ b/src/pybind/mgr/tox.ini
@@ -183,7 +183,7 @@ modules =
 commands =
     flake8 --config=tox.ini {posargs} \
       {posargs:{[testenv:flake8]modules}}
-    bash -c 'test $(git ls-files cephadm | grep ".py$" | grep -v tests | xargs grep "docker.io" | wc -l) == 15'
+    bash -c 'test $(git ls-files cephadm | grep ".py$" | grep -v tests | xargs grep "docker.io" | wc -l) == 13'
 
 [testenv:jinjalint]
 basepython = python3