From e42223c4fc8ca42e03a5721ae5b0bc5362f144ce Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Thu, 4 Mar 2021 12:33:12 -0600 Subject: [PATCH] qa/suites/rados/cephadm: drop centos/rhel cephadm tests for the moment ...until we sort out the podman problems! :( :( Signed-off-by: Sage Weil --- .../smoke/distro/centos_8.2_kubic_stable.yaml | 1 - .../smoke/distro/rhel_8.3_kubic_stable.yaml | 1 - .../1-start-centos_8_kubic_stable.yaml | 24 ------------------- .../1-start-centos_8_kubic_testing.yaml | 23 ------------------ .../0-distro/centos_8.2_kubic_stable.yaml | 1 - .../upgrade/octopus-x/stress-split/0-distro | 1 + .../octopus-x/stress-split/0-distro/.qa | 1 - .../0-distro/centos_8.2_kubic_stable.yaml | 1 - .../stress-split/0-distro/ubuntu_latest.yaml | 1 - 9 files changed, 1 insertion(+), 53 deletions(-) delete mode 120000 qa/suites/rados/cephadm/smoke/distro/centos_8.2_kubic_stable.yaml delete mode 120000 qa/suites/rados/cephadm/smoke/distro/rhel_8.3_kubic_stable.yaml delete mode 100644 qa/suites/rados/cephadm/upgrade/1-start-distro/1-start-centos_8_kubic_stable.yaml delete mode 100644 qa/suites/rados/cephadm/upgrade/1-start-distro/1-start-centos_8_kubic_testing.yaml delete mode 120000 qa/suites/rados/cephadm/workunits/0-distro/centos_8.2_kubic_stable.yaml create mode 120000 qa/suites/upgrade/octopus-x/stress-split/0-distro delete mode 120000 qa/suites/upgrade/octopus-x/stress-split/0-distro/.qa delete mode 120000 qa/suites/upgrade/octopus-x/stress-split/0-distro/centos_8.2_kubic_stable.yaml delete mode 120000 qa/suites/upgrade/octopus-x/stress-split/0-distro/ubuntu_latest.yaml diff --git a/qa/suites/rados/cephadm/smoke/distro/centos_8.2_kubic_stable.yaml b/qa/suites/rados/cephadm/smoke/distro/centos_8.2_kubic_stable.yaml deleted file mode 120000 index 3afeed74d50..00000000000 --- a/qa/suites/rados/cephadm/smoke/distro/centos_8.2_kubic_stable.yaml +++ /dev/null @@ -1 +0,0 @@ -.qa/distros/podman/centos_8.2_kubic_stable.yaml \ No newline at end of file diff --git a/qa/suites/rados/cephadm/smoke/distro/rhel_8.3_kubic_stable.yaml b/qa/suites/rados/cephadm/smoke/distro/rhel_8.3_kubic_stable.yaml deleted file mode 120000 index 20f0f7c55ea..00000000000 --- a/qa/suites/rados/cephadm/smoke/distro/rhel_8.3_kubic_stable.yaml +++ /dev/null @@ -1 +0,0 @@ -.qa/distros/podman/rhel_8.3_kubic_stable.yaml \ No newline at end of file diff --git a/qa/suites/rados/cephadm/upgrade/1-start-distro/1-start-centos_8_kubic_stable.yaml b/qa/suites/rados/cephadm/upgrade/1-start-distro/1-start-centos_8_kubic_stable.yaml deleted file mode 100644 index 3779371dd09..00000000000 --- a/qa/suites/rados/cephadm/upgrade/1-start-distro/1-start-centos_8_kubic_stable.yaml +++ /dev/null @@ -1,24 +0,0 @@ -os_type: centos -os_version: "8.2" -overrides: - selinux: - whitelist: - - scontext=system_u:system_r:logrotate_t:s0 - -tasks: -- exec: - all: - - sudo dnf -y module disable container-tools - - sudo dnf -y install 'dnf-command(copr)' - - sudo dnf -y copr enable rhcontainerbot/container-selinux - - sudo curl -L -o /etc/yum.repos.d/devel:kubic:libcontainers:stable.repo https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable/CentOS_8/devel:kubic:libcontainers:stable.repo - - sudo dnf remove -y podman - - sudo dnf -y install podman - -- 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 - diff --git a/qa/suites/rados/cephadm/upgrade/1-start-distro/1-start-centos_8_kubic_testing.yaml b/qa/suites/rados/cephadm/upgrade/1-start-distro/1-start-centos_8_kubic_testing.yaml deleted file mode 100644 index a3794f6f701..00000000000 --- a/qa/suites/rados/cephadm/upgrade/1-start-distro/1-start-centos_8_kubic_testing.yaml +++ /dev/null @@ -1,23 +0,0 @@ -os_type: centos -os_version: "8.2" -overrides: - selinux: - whitelist: - - scontext=system_u:system_r:logrotate_t:s0 - -tasks: -- exec: - all: - - sudo dnf -y module disable container-tools - - sudo dnf -y install 'dnf-command(copr)' - - sudo dnf -y copr enable rhcontainerbot/container-selinux - - sudo curl -L -o /etc/yum.repos.d/devel:kubic:libcontainers:testing.repo https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/testing/CentOS_8/devel:kubic:libcontainers:testing.repo - - sudo dnf remove -y podman - - sudo dnf -y install podman - -- 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 diff --git a/qa/suites/rados/cephadm/workunits/0-distro/centos_8.2_kubic_stable.yaml b/qa/suites/rados/cephadm/workunits/0-distro/centos_8.2_kubic_stable.yaml deleted file mode 120000 index 3afeed74d50..00000000000 --- a/qa/suites/rados/cephadm/workunits/0-distro/centos_8.2_kubic_stable.yaml +++ /dev/null @@ -1 +0,0 @@ -.qa/distros/podman/centos_8.2_kubic_stable.yaml \ No newline at end of file diff --git a/qa/suites/upgrade/octopus-x/stress-split/0-distro b/qa/suites/upgrade/octopus-x/stress-split/0-distro new file mode 120000 index 00000000000..f8438813523 --- /dev/null +++ b/qa/suites/upgrade/octopus-x/stress-split/0-distro @@ -0,0 +1 @@ +../../../rados/cephadm/smoke/distro \ No newline at end of file diff --git a/qa/suites/upgrade/octopus-x/stress-split/0-distro/.qa b/qa/suites/upgrade/octopus-x/stress-split/0-distro/.qa deleted file mode 120000 index fea2489fdf6..00000000000 --- a/qa/suites/upgrade/octopus-x/stress-split/0-distro/.qa +++ /dev/null @@ -1 +0,0 @@ -../.qa \ No newline at end of file diff --git a/qa/suites/upgrade/octopus-x/stress-split/0-distro/centos_8.2_kubic_stable.yaml b/qa/suites/upgrade/octopus-x/stress-split/0-distro/centos_8.2_kubic_stable.yaml deleted file mode 120000 index 3afeed74d50..00000000000 --- a/qa/suites/upgrade/octopus-x/stress-split/0-distro/centos_8.2_kubic_stable.yaml +++ /dev/null @@ -1 +0,0 @@ -.qa/distros/podman/centos_8.2_kubic_stable.yaml \ No newline at end of file diff --git a/qa/suites/upgrade/octopus-x/stress-split/0-distro/ubuntu_latest.yaml b/qa/suites/upgrade/octopus-x/stress-split/0-distro/ubuntu_latest.yaml deleted file mode 120000 index 3a09f9abb05..00000000000 --- a/qa/suites/upgrade/octopus-x/stress-split/0-distro/ubuntu_latest.yaml +++ /dev/null @@ -1 +0,0 @@ -.qa/distros/supported/ubuntu_latest.yaml \ No newline at end of file -- 2.39.5