From: Deepika Upadhyay <dupadhya@redhat.com>
Date: Thu, 27 May 2021 08:10:43 +0000 (+0530)
Subject: octopus: qa/cephadm/upgrade: use v15.2.9 for cephadm tests
X-Git-Tag: v15.2.14~57^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F41568%2Fhead;p=ceph.git

octopus: qa/cephadm/upgrade: use v15.2.9 for cephadm tests

the issues https://tracker.ceph.com/issues/48142 is fixed in
67166de82a913e8266c8146f5c8a67d536065fc2 which at minimal needs v15.2.8
to be effective.

cherry-pick was not trivial because of difference in set of distro used
for testing.

Signed-off-by: Deepika Upadhyay <dupadhya@redhat.com>
---

diff --git a/qa/suites/rados/cephadm/upgrade/1-start-distro/1-start-centos_8.yaml b/qa/suites/rados/cephadm/upgrade/1-start-distro/1-start-centos_8.yaml
index 14c803a9a2cb..5d380ad787f3 100644
--- a/qa/suites/rados/cephadm/upgrade/1-start-distro/1-start-centos_8.yaml
+++ b/qa/suites/rados/cephadm/upgrade/1-start-distro/1-start-centos_8.yaml
@@ -1,7 +1,7 @@
 tasks:
 - cephadm:
-    image: docker.io/ceph/ceph:v15.2.5
-    cephadm_branch: v15.2.5
+    image: docker.io/ceph/ceph:v15.2.9
+    cephadm_branch: v15.2.9
     cephadm_git_url: https://github.com/ceph/ceph
     # avoid --cap-add=PTRACE + --privileged for older cephadm versions
     allow_ptrace: false
diff --git a/qa/suites/rados/cephadm/upgrade/1-start-distro/1-start-ubuntu_20.04.yaml b/qa/suites/rados/cephadm/upgrade/1-start-distro/1-start-ubuntu_20.04.yaml
index 0ad5a32d3730..76da6e80a179 100644
--- a/qa/suites/rados/cephadm/upgrade/1-start-distro/1-start-ubuntu_20.04.yaml
+++ b/qa/suites/rados/cephadm/upgrade/1-start-distro/1-start-ubuntu_20.04.yaml
@@ -1,7 +1,7 @@
 tasks:
 - cephadm:
-    image: docker.io/ceph/ceph:v15.2.0
-    cephadm_branch: v15.2.0
+    image: docker.io/ceph/ceph:v15.2.9
+    cephadm_branch: v15.2.9
     cephadm_git_url: https://github.com/ceph/ceph
     # avoid --cap-add=PTRACE + --privileged for older cephadm versions
     allow_ptrace: false