From: Sage Weil <sage@newdream.net>
Date: Thu, 11 Feb 2021 19:08:19 +0000 (-0500)
Subject: qa/suites/rados/cephadm/upgrade: change starting version by distro
X-Git-Tag: v17.1.0~2965^2
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=38e14f923508efc4a18e942869065771598ef915;p=ceph-ci.git

qa/suites/rados/cephadm/upgrade: change starting version by distro

centos/rhel have podman 2, which does not like conflicting --cap-add and
--privileged arguments.  cephadm versions prior to 15.2.5 use both args,
however, which means the rhel/centos upgrade test has to start at 15.2.5
to work at all on those distros (with the updated podman).

Fixes: https://tracker.ceph.com/issues/48142
Signed-off-by: Sage Weil <sage@newdream.net>
---

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
new file mode 100644
index 00000000000..14c803a9a2c
--- /dev/null
+++ b/qa/suites/rados/cephadm/upgrade/1-start-distro/1-start-centos_8.yaml
@@ -0,0 +1,13 @@
+tasks:
+- cephadm:
+    image: docker.io/ceph/ceph:v15.2.5
+    cephadm_branch: v15.2.5
+    cephadm_git_url: https://github.com/ceph/ceph
+    # avoid --cap-add=PTRACE + --privileged for older cephadm versions
+    allow_ptrace: false
+os_type: centos
+os_version: "8.2"
+overrides:
+  selinux:
+    whitelist:
+      - scontext=system_u:system_r:logrotate_t:s0
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
new file mode 100644
index 00000000000..0ad5a32d373
--- /dev/null
+++ b/qa/suites/rados/cephadm/upgrade/1-start-distro/1-start-ubuntu_20.04.yaml
@@ -0,0 +1,9 @@
+tasks:
+- cephadm:
+    image: docker.io/ceph/ceph:v15.2.0
+    cephadm_branch: v15.2.0
+    cephadm_git_url: https://github.com/ceph/ceph
+    # avoid --cap-add=PTRACE + --privileged for older cephadm versions
+    allow_ptrace: false
+os_type: ubuntu
+os_version: "20.04"
diff --git a/qa/suites/rados/cephadm/upgrade/1-start.yaml b/qa/suites/rados/cephadm/upgrade/1-start.yaml
deleted file mode 100644
index f2b44bbb9ca..00000000000
--- a/qa/suites/rados/cephadm/upgrade/1-start.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-tasks:
-- cephadm:
-    image: docker.io/ceph/ceph:v15.2.0
-    cephadm_branch: v15.2.0
-    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/distro$ b/qa/suites/rados/cephadm/upgrade/distro$
deleted file mode 120000
index d2dffb18188..00000000000
--- a/qa/suites/rados/cephadm/upgrade/distro$
+++ /dev/null
@@ -1 +0,0 @@
-../smoke/distro
\ No newline at end of file