From: Casey Bodley Date: Thu, 23 Mar 2023 13:29:34 +0000 (-0400) Subject: qa/rgw: upgrade tests restrict supported distros X-Git-Tag: v18.1.0~152^2 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F51015%2Fhead;p=ceph.git qa/rgw: upgrade tests restrict supported distros Fixes: https://tracker.ceph.com/issues/59135 Signed-off-by: Casey Bodley (cherry picked from commit efb18eb42bb3ed7b13ba6e9594fabbc963bd7a77) --- diff --git a/qa/suites/rgw/upgrade/1-install/.qa b/qa/suites/rgw/upgrade/1-install/.qa new file mode 120000 index 000000000000..fea2489fdf6d --- /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.yaml b/qa/suites/rgw/upgrade/1-install/pacific.yaml deleted file mode 100644 index e98cb55fc327..000000000000 --- a/qa/suites/rgw/upgrade/1-install/pacific.yaml +++ /dev/null @@ -1,9 +0,0 @@ -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/pacific/% b/qa/suites/rgw/upgrade/1-install/pacific/% new file mode 100644 index 000000000000..e69de29bb2d1 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 000000000000..fea2489fdf6d --- /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 000000000000..fea2489fdf6d --- /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 000000000000..bd9854e70298 --- /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 000000000000..29fb99ae23ce --- /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 000000000000..ec89e7921030 --- /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/overrides.yaml b/qa/suites/rgw/upgrade/1-install/pacific/overrides.yaml new file mode 100644 index 000000000000..ab06356f6b36 --- /dev/null +++ b/qa/suites/rgw/upgrade/1-install/pacific/overrides.yaml @@ -0,0 +1,3 @@ +overrides: + ragweed: + default-branch: ceph-master # ceph-pacific doesn't have tox, but tests are the same diff --git a/qa/suites/rgw/upgrade/1-install/quincy.yaml b/qa/suites/rgw/upgrade/1-install/quincy.yaml deleted file mode 100644 index 5c14594fabaa..000000000000 --- a/qa/suites/rgw/upgrade/1-install/quincy.yaml +++ /dev/null @@ -1,7 +0,0 @@ -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/1-install/quincy/% b/qa/suites/rgw/upgrade/1-install/quincy/% new file mode 100644 index 000000000000..e69de29bb2d1 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 000000000000..fea2489fdf6d --- /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 000000000000..fea2489fdf6d --- /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 000000000000..bd9854e70298 --- /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 000000000000..29fb99ae23ce --- /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 000000000000..a96f09ee74cb --- /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/overrides.yaml b/qa/suites/rgw/upgrade/1-install/quincy/overrides.yaml new file mode 100644 index 000000000000..ef9110a956d4 --- /dev/null +++ b/qa/suites/rgw/upgrade/1-install/quincy/overrides.yaml @@ -0,0 +1,3 @@ +overrides: + ragweed: + default-branch: ceph-master # ceph-quincy doesn't have tox, but tests are the same diff --git a/qa/suites/rgw/upgrade/supported-random-distro$ b/qa/suites/rgw/upgrade/supported-random-distro$ deleted file mode 120000 index 0862b4457b37..000000000000 --- a/qa/suites/rgw/upgrade/supported-random-distro$ +++ /dev/null @@ -1 +0,0 @@ -.qa/distros/supported-random-distro$ \ No newline at end of file