From 028de28ce6d4430bde331189e58feae903562f7d Mon Sep 17 00:00:00 2001 From: Adam King Date: Mon, 29 Sep 2025 11:54:08 -0400 Subject: [PATCH] cephadm: set default image for tentacle release Signed-off-by: Adam King --- src/cephadm/cephadmlib/constants.py | 4 ++-- src/cephadm/tests/test_util_funcs.py | 2 +- src/cephadm/tox.ini | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/cephadm/cephadmlib/constants.py b/src/cephadm/cephadmlib/constants.py index ba8f5678582..b55ead842d8 100644 --- a/src/cephadm/cephadmlib/constants.py +++ b/src/cephadm/cephadmlib/constants.py @@ -1,8 +1,8 @@ # constants.py - constant values used throughout the cephadm sources # Default container images ----------------------------------------------------- -DEFAULT_IMAGE = 'quay.ceph.io/ceph-ci/ceph:main' -DEFAULT_IMAGE_IS_MAIN = True +DEFAULT_IMAGE = 'quay.io/ceph/ceph:v20' +DEFAULT_IMAGE_IS_MAIN = False DEFAULT_IMAGE_RELEASE = 'tentacle' DEFAULT_REGISTRY = 'quay.io' # normalize unqualified digests to this # ------------------------------------------------------------------------------ diff --git a/src/cephadm/tests/test_util_funcs.py b/src/cephadm/tests/test_util_funcs.py index d2aa39aca4b..cb6ed2d1573 100644 --- a/src/cephadm/tests/test_util_funcs.py +++ b/src/cephadm/tests/test_util_funcs.py @@ -761,7 +761,7 @@ class CompareContext2: def check(self, ctx): assert ctx.name == 'cc2' assert ctx.fsid == 'foobar' - assert ctx.image == 'quay.ceph.io/ceph-ci/ceph:main' + assert ctx.image == 'quay.io/ceph/ceph:v20' assert ctx.meta_properties == {"fruit": "banana", "vegetable": "carrot"} assert ctx.config_blobs == { "alpha": {"sloop": "John B"}, diff --git a/src/cephadm/tox.ini b/src/cephadm/tox.ini index 751ff8c2558..13104797d24 100644 --- a/src/cephadm/tox.ini +++ b/src/cephadm/tox.ini @@ -59,7 +59,7 @@ deps = commands = flake8 --config=tox.ini {posargs:cephadm.py cephadmlib} bash -c 'test $(git ls-files 'cephadm.py' 'cephadmlib/*.py' | sort -u | xargs grep "docker.io" | wc -l) == 1' - bash -c 'test $(git ls-files 'cephadm.py' 'cephadmlib/*.py' | sort -u | xargs grep "quay.io" | wc -l) == 7' + bash -c 'test $(git ls-files 'cephadm.py' 'cephadmlib/*.py' | sort -u | xargs grep "quay.io" | wc -l) == 8' # Downstream distributions may choose to alter this "docker.io" number, # to make sure no new references to docker.io are creeping in unnoticed. -- 2.39.5