]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
qa/cephadm: use reef image as default for test_cephadm workunit 56714/head
authorAdam King <adking@redhat.com>
Thu, 4 Apr 2024 19:36:59 +0000 (15:36 -0400)
committerAdam King <adking@redhat.com>
Thu, 4 Apr 2024 19:36:59 +0000 (15:36 -0400)
This patch is intended directly for the reef branch. On reef,
we should be running tests using the reef image. This should have
been updated at some point after reef branched off from main. The
only reason the issue wasn't immediately apparent is the test
continued to succeed until the version on main went from 18 -> 19

Fixes: https://tracker.ceph.com/issues/64208
Signed-off-by: Adam King <adking@redhat.com>
qa/workunits/cephadm/test_cephadm.sh

index 7d06a3326083d309b1738a5c8e140be80303466d..531f7a6ba49e2193fef4db2f07b46a9498824017 100755 (executable)
@@ -9,10 +9,10 @@ SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 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_DEFAULT=${IMAGE_REEF}
 
 OSD_IMAGE_NAME="${SCRIPT_NAME%.*}_osd.img"
 OSD_IMAGE_SIZE='6G'