From 5c7a44ab7429bdfebad6cce28919a60df8fc63cc Mon Sep 17 00:00:00 2001 From: Casey Bodley Date: Thu, 23 Mar 2023 09:29:34 -0400 Subject: [PATCH] qa/rgw: upgrade tests restrict supported distros Fixes: https://tracker.ceph.com/issues/59135 Signed-off-by: Casey Bodley (cherry picked from commit efb18eb42bb3ed7b13ba6e9594fabbc963bd7a77) --- qa/suites/rgw/upgrade/1-install/.qa | 1 + qa/suites/rgw/upgrade/1-install/pacific/% | 0 qa/suites/rgw/upgrade/1-install/pacific/.qa | 1 + qa/suites/rgw/upgrade/1-install/pacific/distro$/.qa | 1 + .../upgrade/1-install/pacific/distro$/centos_latest.yaml | 1 + .../rgw/upgrade/1-install/pacific/distro$/ubuntu_20.04.yaml | 1 + qa/suites/rgw/upgrade/1-install/pacific/install.yaml | 5 +++++ .../1-install/{pacific.yaml => pacific/overrides.yaml} | 6 ------ qa/suites/rgw/upgrade/1-install/quincy/% | 0 qa/suites/rgw/upgrade/1-install/quincy/.qa | 1 + qa/suites/rgw/upgrade/1-install/quincy/distro$/.qa | 1 + .../rgw/upgrade/1-install/quincy/distro$/centos_latest.yaml | 1 + .../rgw/upgrade/1-install/quincy/distro$/ubuntu_20.04.yaml | 1 + qa/suites/rgw/upgrade/1-install/quincy/install.yaml | 3 +++ .../1-install/{quincy.yaml => quincy/overrides.yaml} | 4 ---- qa/suites/rgw/upgrade/supported-random-distro$ | 1 - 16 files changed, 17 insertions(+), 11 deletions(-) create mode 120000 qa/suites/rgw/upgrade/1-install/.qa create mode 100644 qa/suites/rgw/upgrade/1-install/pacific/% create mode 120000 qa/suites/rgw/upgrade/1-install/pacific/.qa create mode 120000 qa/suites/rgw/upgrade/1-install/pacific/distro$/.qa create mode 120000 qa/suites/rgw/upgrade/1-install/pacific/distro$/centos_latest.yaml create mode 120000 qa/suites/rgw/upgrade/1-install/pacific/distro$/ubuntu_20.04.yaml create mode 100644 qa/suites/rgw/upgrade/1-install/pacific/install.yaml rename qa/suites/rgw/upgrade/1-install/{pacific.yaml => pacific/overrides.yaml} (57%) create mode 100644 qa/suites/rgw/upgrade/1-install/quincy/% create mode 120000 qa/suites/rgw/upgrade/1-install/quincy/.qa create mode 120000 qa/suites/rgw/upgrade/1-install/quincy/distro$/.qa create mode 120000 qa/suites/rgw/upgrade/1-install/quincy/distro$/centos_latest.yaml create mode 120000 qa/suites/rgw/upgrade/1-install/quincy/distro$/ubuntu_20.04.yaml create mode 100644 qa/suites/rgw/upgrade/1-install/quincy/install.yaml rename qa/suites/rgw/upgrade/1-install/{quincy.yaml => quincy/overrides.yaml} (74%) delete mode 120000 qa/suites/rgw/upgrade/supported-random-distro$ diff --git a/qa/suites/rgw/upgrade/1-install/.qa b/qa/suites/rgw/upgrade/1-install/.qa new file mode 120000 index 0000000000000..fea2489fdf6d9 --- /dev/null +++ b/qa/suites/rgw/upgrade/1-install/.qa @@ -0,0 +1 @@ +../.qa \ No newline at end of file diff --git a/qa/suites/rgw/upgrade/1-install/pacific/% b/qa/suites/rgw/upgrade/1-install/pacific/% new file mode 100644 index 0000000000000..e69de29bb2d1d diff --git a/qa/suites/rgw/upgrade/1-install/pacific/.qa b/qa/suites/rgw/upgrade/1-install/pacific/.qa new file mode 120000 index 0000000000000..fea2489fdf6d9 --- /dev/null +++ b/qa/suites/rgw/upgrade/1-install/pacific/.qa @@ -0,0 +1 @@ +../.qa \ No newline at end of file diff --git a/qa/suites/rgw/upgrade/1-install/pacific/distro$/.qa b/qa/suites/rgw/upgrade/1-install/pacific/distro$/.qa new file mode 120000 index 0000000000000..fea2489fdf6d9 --- /dev/null +++ b/qa/suites/rgw/upgrade/1-install/pacific/distro$/.qa @@ -0,0 +1 @@ +../.qa \ No newline at end of file diff --git a/qa/suites/rgw/upgrade/1-install/pacific/distro$/centos_latest.yaml b/qa/suites/rgw/upgrade/1-install/pacific/distro$/centos_latest.yaml new file mode 120000 index 0000000000000..bd9854e702982 --- /dev/null +++ b/qa/suites/rgw/upgrade/1-install/pacific/distro$/centos_latest.yaml @@ -0,0 +1 @@ +.qa/distros/supported/centos_latest.yaml \ No newline at end of file diff --git a/qa/suites/rgw/upgrade/1-install/pacific/distro$/ubuntu_20.04.yaml b/qa/suites/rgw/upgrade/1-install/pacific/distro$/ubuntu_20.04.yaml new file mode 120000 index 0000000000000..29fb99ae23ce2 --- /dev/null +++ b/qa/suites/rgw/upgrade/1-install/pacific/distro$/ubuntu_20.04.yaml @@ -0,0 +1 @@ +.qa/distros/supported/ubuntu_20.04.yaml \ No newline at end of file diff --git a/qa/suites/rgw/upgrade/1-install/pacific/install.yaml b/qa/suites/rgw/upgrade/1-install/pacific/install.yaml new file mode 100644 index 0000000000000..ec89e79210305 --- /dev/null +++ b/qa/suites/rgw/upgrade/1-install/pacific/install.yaml @@ -0,0 +1,5 @@ +tasks: +- install: + branch: pacific + exclude_packages: + - ceph-volume diff --git a/qa/suites/rgw/upgrade/1-install/pacific.yaml b/qa/suites/rgw/upgrade/1-install/pacific/overrides.yaml similarity index 57% rename from qa/suites/rgw/upgrade/1-install/pacific.yaml rename to qa/suites/rgw/upgrade/1-install/pacific/overrides.yaml index e98cb55fc327a..ab06356f6b365 100644 --- a/qa/suites/rgw/upgrade/1-install/pacific.yaml +++ b/qa/suites/rgw/upgrade/1-install/pacific/overrides.yaml @@ -1,9 +1,3 @@ overrides: ragweed: default-branch: ceph-master # ceph-pacific doesn't have tox, but tests are the same - -tasks: -- install: - branch: pacific - exclude_packages: - - ceph-volume diff --git a/qa/suites/rgw/upgrade/1-install/quincy/% b/qa/suites/rgw/upgrade/1-install/quincy/% new file mode 100644 index 0000000000000..e69de29bb2d1d diff --git a/qa/suites/rgw/upgrade/1-install/quincy/.qa b/qa/suites/rgw/upgrade/1-install/quincy/.qa new file mode 120000 index 0000000000000..fea2489fdf6d9 --- /dev/null +++ b/qa/suites/rgw/upgrade/1-install/quincy/.qa @@ -0,0 +1 @@ +../.qa \ No newline at end of file diff --git a/qa/suites/rgw/upgrade/1-install/quincy/distro$/.qa b/qa/suites/rgw/upgrade/1-install/quincy/distro$/.qa new file mode 120000 index 0000000000000..fea2489fdf6d9 --- /dev/null +++ b/qa/suites/rgw/upgrade/1-install/quincy/distro$/.qa @@ -0,0 +1 @@ +../.qa \ No newline at end of file diff --git a/qa/suites/rgw/upgrade/1-install/quincy/distro$/centos_latest.yaml b/qa/suites/rgw/upgrade/1-install/quincy/distro$/centos_latest.yaml new file mode 120000 index 0000000000000..bd9854e702982 --- /dev/null +++ b/qa/suites/rgw/upgrade/1-install/quincy/distro$/centos_latest.yaml @@ -0,0 +1 @@ +.qa/distros/supported/centos_latest.yaml \ No newline at end of file diff --git a/qa/suites/rgw/upgrade/1-install/quincy/distro$/ubuntu_20.04.yaml b/qa/suites/rgw/upgrade/1-install/quincy/distro$/ubuntu_20.04.yaml new file mode 120000 index 0000000000000..29fb99ae23ce2 --- /dev/null +++ b/qa/suites/rgw/upgrade/1-install/quincy/distro$/ubuntu_20.04.yaml @@ -0,0 +1 @@ +.qa/distros/supported/ubuntu_20.04.yaml \ No newline at end of file diff --git a/qa/suites/rgw/upgrade/1-install/quincy/install.yaml b/qa/suites/rgw/upgrade/1-install/quincy/install.yaml new file mode 100644 index 0000000000000..a96f09ee74cba --- /dev/null +++ b/qa/suites/rgw/upgrade/1-install/quincy/install.yaml @@ -0,0 +1,3 @@ +tasks: +- install: + branch: quincy diff --git a/qa/suites/rgw/upgrade/1-install/quincy.yaml b/qa/suites/rgw/upgrade/1-install/quincy/overrides.yaml similarity index 74% rename from qa/suites/rgw/upgrade/1-install/quincy.yaml rename to qa/suites/rgw/upgrade/1-install/quincy/overrides.yaml index 5c14594fabaa4..ef9110a956d45 100644 --- a/qa/suites/rgw/upgrade/1-install/quincy.yaml +++ b/qa/suites/rgw/upgrade/1-install/quincy/overrides.yaml @@ -1,7 +1,3 @@ overrides: ragweed: default-branch: ceph-master # ceph-quincy doesn't have tox, but tests are the same - -tasks: -- install: - branch: quincy diff --git a/qa/suites/rgw/upgrade/supported-random-distro$ b/qa/suites/rgw/upgrade/supported-random-distro$ deleted file mode 120000 index 0862b4457b37a..0000000000000 --- a/qa/suites/rgw/upgrade/supported-random-distro$ +++ /dev/null @@ -1 +0,0 @@ -.qa/distros/supported-random-distro$ \ No newline at end of file -- 2.39.5