From: Adam King <adking@redhat.com>
Date: Thu, 4 Apr 2024 19:43:22 +0000 (-0400)
Subject: qa/cephadm: use squid image as default for test_cephadm workunit
X-Git-Tag: v19.1.0~51^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=2b14b41e2bb47d42ee9c285fdc7472af2722c086;p=ceph.git

qa/cephadm: use squid image as default for test_cephadm workunit

This patch is intended directly for the squid branch. On squid,
we should be running tests using the squid image. This should have
been updated at some point after squid branched off from main. This
hasn't started causing any actual test failures yet, but will as
soon as the version on main goes from 19 -> 20

Fixes: https://tracker.ceph.com/issues/64208

Signed-off-by: Adam King <adking@redhat.com>
---

diff --git a/qa/workunits/cephadm/test_cephadm.sh b/qa/workunits/cephadm/test_cephadm.sh
index 7d06a3326083..5f153bb5884d 100755
--- a/qa/workunits/cephadm/test_cephadm.sh
+++ b/qa/workunits/cephadm/test_cephadm.sh
@@ -10,9 +10,10 @@ FSID='00000000-0000-0000-0000-0000deadbeef'
 
 # images that are used
 IMAGE_MAIN=${IMAGE_MAIN:-'quay.ceph.io/ceph-ci/ceph:main'}
-IMAGE_PACIFIC=${IMAGE_PACIFIC:-'quay.ceph.io/ceph-ci/ceph:pacific'}
-#IMAGE_OCTOPUS=${IMAGE_OCTOPUS:-'quay.ceph.io/ceph-ci/ceph:octopus'}
-IMAGE_DEFAULT=${IMAGE_MAIN}
+IMAGE_QUINCY=${IMAGE_QUINCY:-'quay.ceph.io/ceph-ci/ceph:quincy'}
+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_SQUID}
 
 OSD_IMAGE_NAME="${SCRIPT_NAME%.*}_osd.img"
 OSD_IMAGE_SIZE='6G'