From d22867dc5d67bc1ca2ff180baa39ae39c6ec93d8 Mon Sep 17 00:00:00 2001 From: Travis Nielsen Date: Thu, 14 Aug 2025 13:58:09 -0600 Subject: [PATCH] test: run integration tests against v19.2.2 The integration tests are failing against the v19 tag due to a change in v19.2.3 causing a failure in the object store tests. Thus, in the release-1.16 branch focus the object tests on v19.2.2. See See https://github.com/rook/rook/issues/16188 Signed-off-by: Travis Nielsen --- tests/framework/installer/ceph_installer.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/tests/framework/installer/ceph_installer.go b/tests/framework/installer/ceph_installer.go index e7fed2c15..2ca8354b6 100644 --- a/tests/framework/installer/ceph_installer.go +++ b/tests/framework/installer/ceph_installer.go @@ -43,8 +43,10 @@ import ( const ( // test with the latest releases - reefTestImage = "quay.io/ceph/ceph:v18" - squidTestImage = "quay.io/ceph/ceph:v19" + reefTestImage = "quay.io/ceph/ceph:v18" + // There is an object store regression in v19.2.3, so test against v19.2.2 in the 1.16 branch + // See https://github.com/rook/rook/issues/16188 + squidTestImage = "quay.io/ceph/ceph:v19.2.2" // test with the current development versions reefDevelTestImage = "quay.ceph.io/ceph-ci/ceph:reef" squidDevelTestImage = "quay.ceph.io/ceph-ci/ceph:squid" @@ -209,7 +211,6 @@ func (h *CephInstaller) Execute(command string, parameters []string, namespace s // CreateCephCluster creates rook cluster via kubectl func (h *CephInstaller) CreateCephCluster() error { - ctx := context.TODO() var err error h.settings.DataDirHostPath, err = h.initTestDir(h.settings.Namespace) @@ -436,7 +437,7 @@ func (h *CephInstaller) initTestDir(namespace string) (string, error) { // skip the test dir creation if we are not running under "/data" if val != "/data" { // Create the test dir on the local host - if err := os.MkdirAll(testDir, 0777); err != nil { + if err := os.MkdirAll(testDir, 0o777); err != nil { return "", err } @@ -867,7 +868,7 @@ func (h *CephInstaller) checkCephHealthStatus() { // The health status is not stable enough for the integration tests to rely on. // We should enable this check if we can get the ceph status to be stable despite all the changing configurations performed by rook. - //assert.Equal(h.T(), "HEALTH_OK", clusterResource.Status.CephStatus.Health) + // assert.Equal(h.T(), "HEALTH_OK", clusterResource.Status.CephStatus.Health) assert.NotEqual(h.T(), "", clusterResource.Status.CephStatus.LastChecked) // Print the details if the health is not ok @@ -907,7 +908,6 @@ func (h *CephInstaller) GatherAllRookLogs(testName string, namespaces ...string) // NewCephInstaller creates new instance of CephInstaller func NewCephInstaller(t func() *testing.T, clientset *kubernetes.Clientset, settings *TestCephSettings) *CephInstaller { - // By default set a cluster name that is different from the namespace so we don't rely on the namespace // in expected places if settings.ClusterName == "" {