From 9f0f1339d060533b6c8e08ffe8cfccfb47b9163d Mon Sep 17 00:00:00 2001 From: Yuri Weinstein Date: Mon, 20 May 2019 13:11:37 -0700 Subject: [PATCH] qa/tests: cleaned up supported distro Signed-off-by: Yuri Weinstein --- qa/distros/all/centos_7.6.yaml | 3 +++ qa/distros/all/rhel_7.6.yaml | 3 +++ qa/suites/big/.qa | 2 +- .../luminous-client-x/basic/supported/.qa | 2 +- .../luminous-client-x/basic/supported/centos_7.4.yaml | 1 - .../luminous-client-x/basic/supported/centos_7.6.yaml | 1 + .../luminous-client-x/basic/supported/rhel_7.5.yaml | 1 - .../luminous-client-x/basic/supported/rhel_7.6.yaml | 1 + .../luminous-client-x/basic/supported/ubuntu_18.04.yaml | 1 - .../luminous-client-x/rbd/supported/centos_7.4.yaml | 1 - .../luminous-client-x/rbd/supported/rhel_7.5.yaml | 1 - .../luminous-client-x/rbd/supported/ubuntu_18.04.yaml | 1 - .../luminous-client-x/rbd/supported/centos_7.6.yaml | 1 + .../luminous-client-x/rbd/supported/rhel_7.6.yaml | 1 + 14 files changed, 12 insertions(+), 8 deletions(-) create mode 100644 qa/distros/all/centos_7.6.yaml create mode 100644 qa/distros/all/rhel_7.6.yaml delete mode 120000 qa/suites/upgrade/client-upgrade-luminous-nautilus/luminous-client-x/basic/supported/centos_7.4.yaml create mode 120000 qa/suites/upgrade/client-upgrade-luminous-nautilus/luminous-client-x/basic/supported/centos_7.6.yaml delete mode 120000 qa/suites/upgrade/client-upgrade-luminous-nautilus/luminous-client-x/basic/supported/rhel_7.5.yaml create mode 120000 qa/suites/upgrade/client-upgrade-luminous-nautilus/luminous-client-x/basic/supported/rhel_7.6.yaml delete mode 120000 qa/suites/upgrade/client-upgrade-luminous-nautilus/luminous-client-x/basic/supported/ubuntu_18.04.yaml delete mode 120000 qa/suites/upgrade/client-upgrade-luminous-nautilus/luminous-client-x/rbd/supported/centos_7.4.yaml delete mode 120000 qa/suites/upgrade/client-upgrade-luminous-nautilus/luminous-client-x/rbd/supported/rhel_7.5.yaml delete mode 120000 qa/suites/upgrade/client-upgrade-luminous-nautilus/luminous-client-x/rbd/supported/ubuntu_18.04.yaml create mode 120000 qa/suites/upgrade/clients-upgrades-luminous-nautilus/luminous-client-x/rbd/supported/centos_7.6.yaml create mode 120000 qa/suites/upgrade/clients-upgrades-luminous-nautilus/luminous-client-x/rbd/supported/rhel_7.6.yaml diff --git a/qa/distros/all/centos_7.6.yaml b/qa/distros/all/centos_7.6.yaml new file mode 100644 index 000000000000..a2d4d35c4901 --- /dev/null +++ b/qa/distros/all/centos_7.6.yaml @@ -0,0 +1,3 @@ +os_type: centos +os_version: "7.6" + diff --git a/qa/distros/all/rhel_7.6.yaml b/qa/distros/all/rhel_7.6.yaml new file mode 100644 index 000000000000..806e1fe3010c --- /dev/null +++ b/qa/distros/all/rhel_7.6.yaml @@ -0,0 +1,3 @@ +os_type: rhel +os_version: "7.6" + diff --git a/qa/suites/big/.qa b/qa/suites/big/.qa index a602a0353e75..4d575fee9132 120000 --- a/qa/suites/big/.qa +++ b/qa/suites/big/.qa @@ -1 +1 @@ -../.qa/ \ No newline at end of file +../../../../.qa/ \ No newline at end of file diff --git a/qa/suites/upgrade/client-upgrade-luminous-nautilus/luminous-client-x/basic/supported/.qa b/qa/suites/upgrade/client-upgrade-luminous-nautilus/luminous-client-x/basic/supported/.qa index a602a0353e75..4d575fee9132 120000 --- a/qa/suites/upgrade/client-upgrade-luminous-nautilus/luminous-client-x/basic/supported/.qa +++ b/qa/suites/upgrade/client-upgrade-luminous-nautilus/luminous-client-x/basic/supported/.qa @@ -1 +1 @@ -../.qa/ \ No newline at end of file +../../../../.qa/ \ No newline at end of file diff --git a/qa/suites/upgrade/client-upgrade-luminous-nautilus/luminous-client-x/basic/supported/centos_7.4.yaml b/qa/suites/upgrade/client-upgrade-luminous-nautilus/luminous-client-x/basic/supported/centos_7.4.yaml deleted file mode 120000 index dcc00174237d..000000000000 --- a/qa/suites/upgrade/client-upgrade-luminous-nautilus/luminous-client-x/basic/supported/centos_7.4.yaml +++ /dev/null @@ -1 +0,0 @@ -../../../../../../distros/all/centos_7.4.yaml \ No newline at end of file diff --git a/qa/suites/upgrade/client-upgrade-luminous-nautilus/luminous-client-x/basic/supported/centos_7.6.yaml b/qa/suites/upgrade/client-upgrade-luminous-nautilus/luminous-client-x/basic/supported/centos_7.6.yaml new file mode 120000 index 000000000000..c336cfc6a6e7 --- /dev/null +++ b/qa/suites/upgrade/client-upgrade-luminous-nautilus/luminous-client-x/basic/supported/centos_7.6.yaml @@ -0,0 +1 @@ +../../../../../../distros/all/centos_7.6.yaml \ No newline at end of file diff --git a/qa/suites/upgrade/client-upgrade-luminous-nautilus/luminous-client-x/basic/supported/rhel_7.5.yaml b/qa/suites/upgrade/client-upgrade-luminous-nautilus/luminous-client-x/basic/supported/rhel_7.5.yaml deleted file mode 120000 index 72133969a7da..000000000000 --- a/qa/suites/upgrade/client-upgrade-luminous-nautilus/luminous-client-x/basic/supported/rhel_7.5.yaml +++ /dev/null @@ -1 +0,0 @@ -../../../../../../distros/all/rhel_7.5.yaml \ No newline at end of file diff --git a/qa/suites/upgrade/client-upgrade-luminous-nautilus/luminous-client-x/basic/supported/rhel_7.6.yaml b/qa/suites/upgrade/client-upgrade-luminous-nautilus/luminous-client-x/basic/supported/rhel_7.6.yaml new file mode 120000 index 000000000000..4fd43cc0ddef --- /dev/null +++ b/qa/suites/upgrade/client-upgrade-luminous-nautilus/luminous-client-x/basic/supported/rhel_7.6.yaml @@ -0,0 +1 @@ +../../../../../../distros/all/rhel_7.6.yaml \ No newline at end of file diff --git a/qa/suites/upgrade/client-upgrade-luminous-nautilus/luminous-client-x/basic/supported/ubuntu_18.04.yaml b/qa/suites/upgrade/client-upgrade-luminous-nautilus/luminous-client-x/basic/supported/ubuntu_18.04.yaml deleted file mode 120000 index 886e87fa22d5..000000000000 --- a/qa/suites/upgrade/client-upgrade-luminous-nautilus/luminous-client-x/basic/supported/ubuntu_18.04.yaml +++ /dev/null @@ -1 +0,0 @@ -../../../../../../distros/all/ubuntu_18.04.yaml \ No newline at end of file diff --git a/qa/suites/upgrade/client-upgrade-luminous-nautilus/luminous-client-x/rbd/supported/centos_7.4.yaml b/qa/suites/upgrade/client-upgrade-luminous-nautilus/luminous-client-x/rbd/supported/centos_7.4.yaml deleted file mode 120000 index dcc00174237d..000000000000 --- a/qa/suites/upgrade/client-upgrade-luminous-nautilus/luminous-client-x/rbd/supported/centos_7.4.yaml +++ /dev/null @@ -1 +0,0 @@ -../../../../../../distros/all/centos_7.4.yaml \ No newline at end of file diff --git a/qa/suites/upgrade/client-upgrade-luminous-nautilus/luminous-client-x/rbd/supported/rhel_7.5.yaml b/qa/suites/upgrade/client-upgrade-luminous-nautilus/luminous-client-x/rbd/supported/rhel_7.5.yaml deleted file mode 120000 index 72133969a7da..000000000000 --- a/qa/suites/upgrade/client-upgrade-luminous-nautilus/luminous-client-x/rbd/supported/rhel_7.5.yaml +++ /dev/null @@ -1 +0,0 @@ -../../../../../../distros/all/rhel_7.5.yaml \ No newline at end of file diff --git a/qa/suites/upgrade/client-upgrade-luminous-nautilus/luminous-client-x/rbd/supported/ubuntu_18.04.yaml b/qa/suites/upgrade/client-upgrade-luminous-nautilus/luminous-client-x/rbd/supported/ubuntu_18.04.yaml deleted file mode 120000 index 886e87fa22d5..000000000000 --- a/qa/suites/upgrade/client-upgrade-luminous-nautilus/luminous-client-x/rbd/supported/ubuntu_18.04.yaml +++ /dev/null @@ -1 +0,0 @@ -../../../../../../distros/all/ubuntu_18.04.yaml \ No newline at end of file diff --git a/qa/suites/upgrade/clients-upgrades-luminous-nautilus/luminous-client-x/rbd/supported/centos_7.6.yaml b/qa/suites/upgrade/clients-upgrades-luminous-nautilus/luminous-client-x/rbd/supported/centos_7.6.yaml new file mode 120000 index 000000000000..c336cfc6a6e7 --- /dev/null +++ b/qa/suites/upgrade/clients-upgrades-luminous-nautilus/luminous-client-x/rbd/supported/centos_7.6.yaml @@ -0,0 +1 @@ +../../../../../../distros/all/centos_7.6.yaml \ No newline at end of file diff --git a/qa/suites/upgrade/clients-upgrades-luminous-nautilus/luminous-client-x/rbd/supported/rhel_7.6.yaml b/qa/suites/upgrade/clients-upgrades-luminous-nautilus/luminous-client-x/rbd/supported/rhel_7.6.yaml new file mode 120000 index 000000000000..4fd43cc0ddef --- /dev/null +++ b/qa/suites/upgrade/clients-upgrades-luminous-nautilus/luminous-client-x/rbd/supported/rhel_7.6.yaml @@ -0,0 +1 @@ +../../../../../../distros/all/rhel_7.6.yaml \ No newline at end of file -- 2.47.3