From: Adam King <adking@redhat.com>
Date: Tue, 8 Aug 2023 16:17:55 +0000 (-0400)
Subject: qa/cephadm: update start version of upgrade tests to quincy
X-Git-Tag: v19.0.0~504^2~2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=0872eaacdba9b83a2afa674473a587f03d425428;p=ceph.git

qa/cephadm: update start version of upgrade tests to quincy

We're now past the reef release, so main is now what
will become squid and we should only be testing upgrades
to squid from quincy onward

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

diff --git a/qa/suites/orch/cephadm/upgrade/1-start-distro/1-start-centos_8.stream_container-tools.yaml b/qa/suites/orch/cephadm/upgrade/1-start-distro/1-start-centos_8.stream_container-tools.yaml
index bb9a220e698..db57ea8874f 100644
--- a/qa/suites/orch/cephadm/upgrade/1-start-distro/1-start-centos_8.stream_container-tools.yaml
+++ b/qa/suites/orch/cephadm/upgrade/1-start-distro/1-start-centos_8.stream_container-tools.yaml
@@ -9,12 +9,9 @@ tasks:
     - sudo dnf -y  module install container-tools
     - sudo cp /etc/containers/registries.conf.backup /etc/containers/registries.conf
 - cephadm:
-    image: quay.io/ceph/ceph:v16.2.0
-    cephadm_branch: v16.2.0
+    image: quay.io/ceph/ceph:v17.2.0
+    cephadm_branch: v17.2.0
     cephadm_git_url: https://github.com/ceph/ceph
-    # avoid --cap-add=PTRACE + --privileged for older cephadm versions
-    allow_ptrace: false
-    avoid_pacific_features: true
 
 roles:
 - - mon.a
diff --git a/qa/suites/orch/cephadm/upgrade/1-start-distro/1-start-ubuntu_20.04.yaml b/qa/suites/orch/cephadm/upgrade/1-start-distro/1-start-ubuntu_20.04.yaml
index d3d9de83eb1..dd33de8067e 100644
--- a/qa/suites/orch/cephadm/upgrade/1-start-distro/1-start-ubuntu_20.04.yaml
+++ b/qa/suites/orch/cephadm/upgrade/1-start-distro/1-start-ubuntu_20.04.yaml
@@ -3,12 +3,9 @@ os_version: "20.04"
 
 tasks:
 - cephadm:
-    image: quay.io/ceph/ceph:v16.2.0
-    cephadm_branch: v16.2.0
+    image: quay.io/ceph/ceph:v17.2.0
+    cephadm_branch: v17.2.0
     cephadm_git_url: https://github.com/ceph/ceph
-    # avoid --cap-add=PTRACE + --privileged for older cephadm versions
-    allow_ptrace: false
-    avoid_pacific_features: true
 
 roles:
 - - mon.a