gian/ceph-mirror
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2026-08-02 07:03:18 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #68288 from lumir-sliva/qa/fix-cephadm-release-mismatch

Browse Source 
qa/cephadm: derive container image from cephadm release

Reviewed-by: Redouane Kachach <rkachach@ibm.com>
This commit is contained in:
Redouane Kachach 2026-04-10 23:15:28 +02:00 committed by GitHub
commit e999950dcc
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
qa/workunits/cephadm/test_cephadm.sh
View File

@ -12,7 +12,6 @@ FSID='00000000-0000-0000-0000-0000deadbeef'
IMAGE_MAIN=${IMAGE_MAIN:-'quay.ceph.io/ceph-ci/ceph:main'}
IMAGE_REEF=${IMAGE_REEF:-'quay.ceph.io/ceph-ci/ceph:reef'}
IMAGE_SQUID=${IMAGE_SQUID:-'quay.ceph.io/ceph-ci/ceph:squid'}
IMAGE_DEFAULT=${IMAGE_MAIN}
OSD_IMAGE_NAME="${SCRIPT_NAME%.*}_osd.img"
OSD_IMAGE_SIZE='6G'
@ -47,6 +46,20 @@ if ! [ -x "$CEPHADM" ]; then
exit 1
fi
# Derive IMAGE_DEFAULT from cephadm's own release so that stable branches
# pull a matching container instead of always using ceph:main.
# See https://tracker.ceph.com/issues/75821
if [ -z "$IMAGE_DEFAULT" ]; then
_ver=$("$CEPHADM" version 2>/dev/null || true)
_release=$(echo "$_ver" | awk '{print $5}')
_type=$(echo "$_ver" | awk '{gsub(/[()]/, "", $6); print $6}')
if [ -n "$_release" ] && [ "$_type" != "dev" ]; then
IMAGE_DEFAULT="quay.ceph.io/ceph-ci/ceph:${_release}"
else
IMAGE_DEFAULT=${IMAGE_MAIN}
fi
fi
# add image to args
CEPHADM_ARGS="$CEPHADM_ARGS --image $IMAGE_DEFAULT"