From 38e14f923508efc4a18e942869065771598ef915 Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Thu, 11 Feb 2021 14:08:19 -0500 Subject: [PATCH] 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 --- .../upgrade/1-start-distro/1-start-centos_8.yaml | 13 +++++++++++++ .../1-start-ubuntu_20.04.yaml} | 2 ++ qa/suites/rados/cephadm/upgrade/distro$ | 1 - 3 files changed, 15 insertions(+), 1 deletion(-) create mode 100644 qa/suites/rados/cephadm/upgrade/1-start-distro/1-start-centos_8.yaml rename qa/suites/rados/cephadm/upgrade/{1-start.yaml => 1-start-distro/1-start-ubuntu_20.04.yaml} (86%) delete mode 120000 qa/suites/rados/cephadm/upgrade/distro$ 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 000000000000..14c803a9a2cb --- /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.yaml b/qa/suites/rados/cephadm/upgrade/1-start-distro/1-start-ubuntu_20.04.yaml similarity index 86% rename from qa/suites/rados/cephadm/upgrade/1-start.yaml rename to qa/suites/rados/cephadm/upgrade/1-start-distro/1-start-ubuntu_20.04.yaml index f2b44bbb9caa..0ad5a32d3730 100644 --- a/qa/suites/rados/cephadm/upgrade/1-start.yaml +++ b/qa/suites/rados/cephadm/upgrade/1-start-distro/1-start-ubuntu_20.04.yaml @@ -5,3 +5,5 @@ tasks: 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/distro$ b/qa/suites/rados/cephadm/upgrade/distro$ deleted file mode 120000 index d2dffb181881..000000000000 --- a/qa/suites/rados/cephadm/upgrade/distro$ +++ /dev/null @@ -1 +0,0 @@ -../smoke/distro \ No newline at end of file -- 2.47.3