From: Deepika Upadhyay Date: Wed, 26 May 2021 09:11:55 +0000 (+0530) Subject: rados/cephadm/qa/distros: update to latest distros X-Git-Tag: v15.2.14~65^2~4 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=bdc89636c4980f2fbd044bcc099022067ccf69da;p=ceph.git rados/cephadm/qa/distros: update to latest distros - removes ubuntu_18.04 support for podman, instead we move to focal. - use rhel_8.3 for all rhel_8 references - use {centos/rhel}_8 instead of {rhel/centos}_latest: to keep things same in master and octopus since we use: rhel_8 and centos_8 as latest version symlinks, which differentiated after an octopus only commit. this was not cherry picked from master as octopus had some of the symlinks, not in sync with master, this commit does cleanup for them, and tries to make them similar to master. (updates introduced change by: 126217febf023a6f561fe88dbdb87b5b2f379798) Signed-off-by: Deepika Upadhyay --- diff --git a/qa/distros/all/centos_8.yaml b/qa/distros/all/centos_8.yaml index 8abfcfd1247..e9308ad1a4f 120000 --- a/qa/distros/all/centos_8.yaml +++ b/qa/distros/all/centos_8.yaml @@ -1 +1 @@ -centos_8.1.yaml \ No newline at end of file +centos_8.3.yaml \ No newline at end of file diff --git a/qa/distros/supported-all-distro/rhel_8.2.yaml b/qa/distros/supported-all-distro/rhel_8.2.yaml deleted file mode 120000 index dd95793a8c1..00000000000 --- a/qa/distros/supported-all-distro/rhel_8.2.yaml +++ /dev/null @@ -1 +0,0 @@ -../all/rhel_8.2.yaml \ No newline at end of file diff --git a/qa/distros/supported-random-distro$/centos_latest.yaml b/qa/distros/supported-random-distro$/centos_latest.yaml deleted file mode 120000 index 591d55ba555..00000000000 --- a/qa/distros/supported-random-distro$/centos_latest.yaml +++ /dev/null @@ -1 +0,0 @@ -../all/centos_8.1.yaml \ No newline at end of file diff --git a/qa/distros/supported-random-distro$/rhel_latest.yaml b/qa/distros/supported-random-distro$/rhel_latest.yaml deleted file mode 120000 index dd95793a8c1..00000000000 --- a/qa/distros/supported-random-distro$/rhel_latest.yaml +++ /dev/null @@ -1 +0,0 @@ -../all/rhel_8.2.yaml \ No newline at end of file diff --git a/qa/distros/supported/centos_latest.yaml b/qa/distros/supported/centos_latest.yaml index 591d55ba555..b7e6c9b4e54 120000 --- a/qa/distros/supported/centos_latest.yaml +++ b/qa/distros/supported/centos_latest.yaml @@ -1 +1 @@ -../all/centos_8.1.yaml \ No newline at end of file +../all/centos_8.yaml \ No newline at end of file diff --git a/qa/distros/supported/rhel_latest.yaml b/qa/distros/supported/rhel_latest.yaml index dd95793a8c1..f803f091ec8 120000 --- a/qa/distros/supported/rhel_latest.yaml +++ b/qa/distros/supported/rhel_latest.yaml @@ -1 +1 @@ -../all/rhel_8.2.yaml \ No newline at end of file +../all/rhel_8.yaml \ No newline at end of file diff --git a/qa/distros/supported/ubuntu_latest.yaml b/qa/distros/supported/ubuntu_latest.yaml index 64a66d9aa48..75d907e3b9c 120000 --- a/qa/distros/supported/ubuntu_latest.yaml +++ b/qa/distros/supported/ubuntu_latest.yaml @@ -1 +1 @@ -../all/ubuntu_18.04.yaml \ No newline at end of file +../all/ubuntu_20.04.yaml \ No newline at end of file diff --git a/qa/suites/rados/cephadm/smoke/distro/centos_7.yaml b/qa/suites/rados/cephadm/smoke/distro/centos_7.yaml deleted file mode 120000 index 5ad8254e140..00000000000 --- a/qa/suites/rados/cephadm/smoke/distro/centos_7.yaml +++ /dev/null @@ -1 +0,0 @@ -.qa/distros/all/centos_7.yaml \ No newline at end of file diff --git a/qa/suites/rados/cephadm/smoke/distro/rhel_7.yaml b/qa/suites/rados/cephadm/smoke/distro/rhel_7.yaml deleted file mode 120000 index b776cd2f7b2..00000000000 --- a/qa/suites/rados/cephadm/smoke/distro/rhel_7.yaml +++ /dev/null @@ -1 +0,0 @@ -.qa/distros/all/rhel_7.yaml \ No newline at end of file diff --git a/qa/suites/rados/cephadm/smoke/distro/rhel_8.0.yaml b/qa/suites/rados/cephadm/smoke/distro/rhel_8.0.yaml deleted file mode 120000 index 7247d53d195..00000000000 --- a/qa/suites/rados/cephadm/smoke/distro/rhel_8.0.yaml +++ /dev/null @@ -1 +0,0 @@ -.qa/distros/all/rhel_8.0.yaml \ No newline at end of file diff --git a/qa/suites/rados/cephadm/smoke/distro/ubuntu_18.04.yaml b/qa/suites/rados/cephadm/smoke/distro/ubuntu_18.04.yaml deleted file mode 120000 index cfb85f10ef5..00000000000 --- a/qa/suites/rados/cephadm/smoke/distro/ubuntu_18.04.yaml +++ /dev/null @@ -1 +0,0 @@ -.qa/distros/all/ubuntu_18.04.yaml \ No newline at end of file diff --git a/qa/suites/rados/cephadm/smoke/distro/ubuntu_20.04_kubic_stable.yaml b/qa/suites/rados/cephadm/smoke/distro/ubuntu_20.04_kubic_stable.yaml deleted file mode 120000 index 065bb1ab20d..00000000000 --- a/qa/suites/rados/cephadm/smoke/distro/ubuntu_20.04_kubic_stable.yaml +++ /dev/null @@ -1 +0,0 @@ -.qa/distros/podman/ubuntu_20.04_kubic_stable.yaml \ No newline at end of file diff --git a/qa/suites/rados/cephadm/smoke/distro/ubuntu_20.04_kubic_testing.yaml b/qa/suites/rados/cephadm/smoke/distro/ubuntu_20.04_kubic_testing.yaml deleted file mode 120000 index 36a5ad131fa..00000000000 --- a/qa/suites/rados/cephadm/smoke/distro/ubuntu_20.04_kubic_testing.yaml +++ /dev/null @@ -1 +0,0 @@ -.qa/distros/podman/ubuntu_20.04_kubic_testing.yaml \ No newline at end of file diff --git a/qa/suites/rados/cephadm/with-work/distro/rhel_8.0.yaml b/qa/suites/rados/cephadm/with-work/distro/rhel_8.0.yaml deleted file mode 120000 index 7247d53d195..00000000000 --- a/qa/suites/rados/cephadm/with-work/distro/rhel_8.0.yaml +++ /dev/null @@ -1 +0,0 @@ -.qa/distros/all/rhel_8.0.yaml \ No newline at end of file diff --git a/qa/suites/rados/cephadm/with-work/distro/ubuntu_18.04_podman.yaml b/qa/suites/rados/cephadm/with-work/distro/ubuntu_18.04_podman.yaml deleted file mode 120000 index b948dd4343c..00000000000 --- a/qa/suites/rados/cephadm/with-work/distro/ubuntu_18.04_podman.yaml +++ /dev/null @@ -1 +0,0 @@ -.qa/distros/all/ubuntu_18.04_podman.yaml \ No newline at end of file