service: Support latest MicroCeph tentacle

.github/workflows/tests.yml

@@ -168,7 +168,7 @@ jobs:
           - "terraform_demo"
         # Set of versions to use for the matrix tests.
         os: ["24.04"]
-        microceph: ["squid/edge"]
+        microceph: ["tentacle/edge"]
         microovn: ["latest/edge"]
         lxd:
           # Both LXD 5.21 and 6 are supported.

service/version.go

@@ -81,15 +81,14 @@ func validateVersion(serviceType types.ServiceType, daemonVersion string) error
 
 	case types.MicroCeph:
 		regex := regexp.MustCompile(`\d+\.\d+\.\d+`)
-		match := regex.FindString(daemonVersion)
-		if match == "" {
+		daemonVersionExtracted := regex.FindString(daemonVersion)
+		if daemonVersionExtracted == "" {
 			return fmt.Errorf("%s version format not supported (%s)", serviceType, daemonVersion)
 		}
 
-		daemonVersion = semver.Canonical("v" + match)
-		expectedVersion := semver.Canonical("v" + microCephMinVersion)
-		if semver.Compare(semver.MajorMinor(daemonVersion), semver.MajorMinor(expectedVersion)) != 0 {
-			return fmt.Errorf("%s version %q is not supported", serviceType, daemonVersion)
+		err := compareVersion(daemonVersionExtracted, microCephMinVersion, serviceType)
+		if err != nil {
+			return err
 		}
 	}
 

service/version_test.go

@@ -110,12 +110,6 @@ func (s *versionSuite) Test_validateVersions() {
 			service:   types.LXD,
 			expectErr: true,
 		},
-		{
-			desc:      "Unsupported MicroCeph with larger major version",
-			version:   "ceph-version: 999.0.0~git",
-			service:   types.MicroCeph,
-			expectErr: true,
-		},
 		{
 			desc:      "Unsupported MicroCeph with smaller major version",
 			version:   "ceph-version: 1.0.0~git",
@@ -135,6 +129,12 @@ func (s *versionSuite) Test_validateVersions() {
 			service:   types.MicroOVN,
 			expectErr: false,
 		},
+		{
+			desc:      "Supported MicroCeph with larger major version",
+			version:   "ceph-version: 20.2.0-0ubuntu0.24.04.1~bpo24.04.1~ppa202602041400; microceph-git: e6eb74a064",
+			service:   types.MicroCeph,
+			expectErr: false,
+		},
 	}
 
 	for i, c := range cases {

test/includes/microcloud.sh

@@ -394,7 +394,7 @@ validate_system_microceph() {
       done
 
      query='{\"query\": \"select count(*) from disks join core_cluster_members on core_cluster_members.id = disks.member_id where core_cluster_members.name = \\\"${name}\\\"\"}'
-     count_disks=\$(curl --unix-socket /var/snap/microceph/common/state/control.socket ./core/internal/sql -X POST -d \"\${query}\" -s)
+     count_disks=\$(curl --unix-socket /var/snap/microceph/common/state/control.socket ./core/control/sql -X POST -d \"\${query}\" -s)
      echo \"\${count_disks}\" | jq '.status_code' | grep -q 200
      echo \"\${count_disks}\" | jq '.metadata .Results[0] .rows[0][0]' | grep -q \${count}
     "

test/suites/upgrade.sh

@@ -22,7 +22,7 @@ test_upgrade() {
   # Perform upgrade test from MicroCloud 2 to 3.
   if [ "${MICROCLOUD_SNAP_CHANNEL}" = "2/candidate" ]; then
     # Use the edge channels to catch issues early in the release process.
-    microceph_target="squid/edge"
+    microceph_target="tentacle/edge"
     microovn_target="latest/edge"
     lxd_target="6/edge"
     microcloud_target="3/edge"