From c73f8ab1c2a9b42ec4afa3f4dd64554b55672fce Mon Sep 17 00:00:00 2001 From: Travis Nielsen Date: Mon, 27 Jul 2026 11:42:46 -0600 Subject: [PATCH] ci: daily tests run stable and devel ceph versions The daily CI smoke, object, and other suites now run all of the known Ceph versions, including stable Squid, Tentacle, and Umbrella, as well as devel versions of the same releases. Signed-off-by: Travis Nielsen --- .github/workflows/daily-nightly-jobs.yml | 2 +- tests/framework/installer/ceph_installer.go | 10 +++++++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/.github/workflows/daily-nightly-jobs.yml b/.github/workflows/daily-nightly-jobs.yml index 7bc778261..4d1e5eb3b 100644 --- a/.github/workflows/daily-nightly-jobs.yml +++ b/.github/workflows/daily-nightly-jobs.yml @@ -30,7 +30,7 @@ jobs: if: github.repository == 'rook/rook' uses: ./.github/workflows/ceph-suite-integration-test.yml with: - ceph_suite_versions: '["squid-devel", "tentacle-devel", "umbrella-devel", "main"]' + ceph_suite_versions: '["squid", "squid-devel", "tentacle", "tentacle-devel", "umbrella", "umbrella-devel", "main"]' object_suite_tests: '["TestWithoutTLS", "TestWithTLS"]' secrets: inherit diff --git a/tests/framework/installer/ceph_installer.go b/tests/framework/installer/ceph_installer.go index 0f079cd95..f50c58a56 100644 --- a/tests/framework/installer/ceph_installer.go +++ b/tests/framework/installer/ceph_installer.go @@ -45,6 +45,7 @@ const ( // test with the latest releases squidTestImage = "quay.io/ceph/ceph:v19" tentacleTestImage = "quay.io/ceph/ceph:v20" + umbrellaTestImage = "quay.io/ceph/ceph:v21" // test with the current development versions squidDevelTestImage = "quay.ceph.io/ceph-ci/ceph:squid" tentacleDevelTestImage = "quay.ceph.io/ceph-ci/ceph:tentacle" @@ -71,6 +72,7 @@ var ( SquidVersion = cephv1.CephVersionSpec{Image: squidTestImage} SquidDevelVersion = cephv1.CephVersionSpec{Image: squidDevelTestImage} TentacleVersion = cephv1.CephVersionSpec{Image: tentacleTestImage} + UmbrellaVersion = cephv1.CephVersionSpec{Image: umbrellaTestImage} TentacleDevelVersion = cephv1.CephVersionSpec{Image: tentacleDevelTestImage, AllowUnsupported: true} UmbrellaDevelVersion = cephv1.CephVersionSpec{Image: umbrellaDevelTestImage, AllowUnsupported: true} MainVersion = cephv1.CephVersionSpec{Image: mainTestImage, AllowUnsupported: true} @@ -97,13 +99,19 @@ func ReturnCephVersion() cephv1.CephVersionSpec { return MainVersion case "squid-devel": return SquidDevelVersion + case "squid": + return SquidVersion case "tentacle-devel": return TentacleDevelVersion + case "tentacle": + return TentacleVersion case "umbrella-devel": return UmbrellaDevelVersion + case "umbrella": + return UmbrellaVersion default: // Default to the latest stable version - return SquidVersion + return TentacleVersion } }