From 16abadc59e5a1e8396dd5122517c2e2b69fc78a1 Mon Sep 17 00:00:00 2001 From: Yuri Weinstein Date: Mon, 20 Apr 2020 15:59:19 -0700 Subject: [PATCH] qa/tests: removed tests 'client-upgrade-octopus-pacific' Signed-off-by: Yuri Weinstein --- .../octopus-client-x/.qa | 1 - .../octopus-client-x/rbd/% | 0 .../octopus-client-x/rbd/.qa | 1 - .../octopus-client-x/rbd/0-cluster/+ | 0 .../octopus-client-x/rbd/0-cluster/.qa | 1 - .../rbd/0-cluster/openstack.yaml | 4 --- .../octopus-client-x/rbd/0-cluster/start.yaml | 21 ----------- .../octopus-client-x/rbd/1-install/.qa | 1 - .../rbd/1-install/nautilus-client-x.yaml | 11 ------ .../octopus-client-x/rbd/2-features/.qa | 1 - .../rbd/2-features/defaults.yaml | 6 ---- .../rbd/2-features/layering.yaml | 6 ---- .../octopus-client-x/rbd/3-workload/.qa | 1 - .../3-workload/rbd_notification_tests.yaml | 36 ------------------- .../octopus-client-x/rbd/supported/.qa | 1 - .../rbd/supported/ubuntu_18.04.yaml | 1 - 16 files changed, 92 deletions(-) delete mode 120000 qa/suites/upgrade/client-upgrade-octopus-pacific/octopus-client-x/.qa delete mode 100644 qa/suites/upgrade/client-upgrade-octopus-pacific/octopus-client-x/rbd/% delete mode 120000 qa/suites/upgrade/client-upgrade-octopus-pacific/octopus-client-x/rbd/.qa delete mode 100644 qa/suites/upgrade/client-upgrade-octopus-pacific/octopus-client-x/rbd/0-cluster/+ delete mode 120000 qa/suites/upgrade/client-upgrade-octopus-pacific/octopus-client-x/rbd/0-cluster/.qa delete mode 100644 qa/suites/upgrade/client-upgrade-octopus-pacific/octopus-client-x/rbd/0-cluster/openstack.yaml delete mode 100644 qa/suites/upgrade/client-upgrade-octopus-pacific/octopus-client-x/rbd/0-cluster/start.yaml delete mode 120000 qa/suites/upgrade/client-upgrade-octopus-pacific/octopus-client-x/rbd/1-install/.qa delete mode 100644 qa/suites/upgrade/client-upgrade-octopus-pacific/octopus-client-x/rbd/1-install/nautilus-client-x.yaml delete mode 120000 qa/suites/upgrade/client-upgrade-octopus-pacific/octopus-client-x/rbd/2-features/.qa delete mode 100644 qa/suites/upgrade/client-upgrade-octopus-pacific/octopus-client-x/rbd/2-features/defaults.yaml delete mode 100644 qa/suites/upgrade/client-upgrade-octopus-pacific/octopus-client-x/rbd/2-features/layering.yaml delete mode 120000 qa/suites/upgrade/client-upgrade-octopus-pacific/octopus-client-x/rbd/3-workload/.qa delete mode 100644 qa/suites/upgrade/client-upgrade-octopus-pacific/octopus-client-x/rbd/3-workload/rbd_notification_tests.yaml delete mode 120000 qa/suites/upgrade/client-upgrade-octopus-pacific/octopus-client-x/rbd/supported/.qa delete mode 120000 qa/suites/upgrade/client-upgrade-octopus-pacific/octopus-client-x/rbd/supported/ubuntu_18.04.yaml diff --git a/qa/suites/upgrade/client-upgrade-octopus-pacific/octopus-client-x/.qa b/qa/suites/upgrade/client-upgrade-octopus-pacific/octopus-client-x/.qa deleted file mode 120000 index a602a0353e75..000000000000 --- a/qa/suites/upgrade/client-upgrade-octopus-pacific/octopus-client-x/.qa +++ /dev/null @@ -1 +0,0 @@ -../.qa/ \ No newline at end of file diff --git a/qa/suites/upgrade/client-upgrade-octopus-pacific/octopus-client-x/rbd/% b/qa/suites/upgrade/client-upgrade-octopus-pacific/octopus-client-x/rbd/% deleted file mode 100644 index e69de29bb2d1..000000000000 diff --git a/qa/suites/upgrade/client-upgrade-octopus-pacific/octopus-client-x/rbd/.qa b/qa/suites/upgrade/client-upgrade-octopus-pacific/octopus-client-x/rbd/.qa deleted file mode 120000 index a602a0353e75..000000000000 --- a/qa/suites/upgrade/client-upgrade-octopus-pacific/octopus-client-x/rbd/.qa +++ /dev/null @@ -1 +0,0 @@ -../.qa/ \ No newline at end of file diff --git a/qa/suites/upgrade/client-upgrade-octopus-pacific/octopus-client-x/rbd/0-cluster/+ b/qa/suites/upgrade/client-upgrade-octopus-pacific/octopus-client-x/rbd/0-cluster/+ deleted file mode 100644 index e69de29bb2d1..000000000000 diff --git a/qa/suites/upgrade/client-upgrade-octopus-pacific/octopus-client-x/rbd/0-cluster/.qa b/qa/suites/upgrade/client-upgrade-octopus-pacific/octopus-client-x/rbd/0-cluster/.qa deleted file mode 120000 index a602a0353e75..000000000000 --- a/qa/suites/upgrade/client-upgrade-octopus-pacific/octopus-client-x/rbd/0-cluster/.qa +++ /dev/null @@ -1 +0,0 @@ -../.qa/ \ No newline at end of file diff --git a/qa/suites/upgrade/client-upgrade-octopus-pacific/octopus-client-x/rbd/0-cluster/openstack.yaml b/qa/suites/upgrade/client-upgrade-octopus-pacific/octopus-client-x/rbd/0-cluster/openstack.yaml deleted file mode 100644 index b0f3b9b4da22..000000000000 --- a/qa/suites/upgrade/client-upgrade-octopus-pacific/octopus-client-x/rbd/0-cluster/openstack.yaml +++ /dev/null @@ -1,4 +0,0 @@ -openstack: - - volumes: # attached to each instance - count: 4 - size: 30 # GB diff --git a/qa/suites/upgrade/client-upgrade-octopus-pacific/octopus-client-x/rbd/0-cluster/start.yaml b/qa/suites/upgrade/client-upgrade-octopus-pacific/octopus-client-x/rbd/0-cluster/start.yaml deleted file mode 100644 index c631b0ed2dfb..000000000000 --- a/qa/suites/upgrade/client-upgrade-octopus-pacific/octopus-client-x/rbd/0-cluster/start.yaml +++ /dev/null @@ -1,21 +0,0 @@ -meta: -- desc: | - Insatll and run ceph on one node, - with a separate client 1. - Upgrade client 1 to octopus - Run tests against old cluster -roles: -- - mon.a - - mon.b - - mon.c - - osd.0 - - osd.1 - - osd.2 - - client.0 - - mgr.x -- - client.1 -overrides: - ceph: - #log-whitelist: - #- failed to encode map - fs: xfs diff --git a/qa/suites/upgrade/client-upgrade-octopus-pacific/octopus-client-x/rbd/1-install/.qa b/qa/suites/upgrade/client-upgrade-octopus-pacific/octopus-client-x/rbd/1-install/.qa deleted file mode 120000 index a602a0353e75..000000000000 --- a/qa/suites/upgrade/client-upgrade-octopus-pacific/octopus-client-x/rbd/1-install/.qa +++ /dev/null @@ -1 +0,0 @@ -../.qa/ \ No newline at end of file diff --git a/qa/suites/upgrade/client-upgrade-octopus-pacific/octopus-client-x/rbd/1-install/nautilus-client-x.yaml b/qa/suites/upgrade/client-upgrade-octopus-pacific/octopus-client-x/rbd/1-install/nautilus-client-x.yaml deleted file mode 100644 index e8758027f781..000000000000 --- a/qa/suites/upgrade/client-upgrade-octopus-pacific/octopus-client-x/rbd/1-install/nautilus-client-x.yaml +++ /dev/null @@ -1,11 +0,0 @@ -tasks: -- install: - branch: octopus - exclude_packages: ['ceph-mgr','libcephfs2','libcephfs-devel','libcephfs-dev','python34-cephfs','python34-rados'] -- print: "**** done install octopus" -- install.upgrade: - exclude_packages: ['ceph-test', 'ceph-test-dbg','libcephfs1', 'python-ceph'] - client.1: -- print: "**** done install.upgrade to -x on client.0" -- ceph: -- print: "**** done ceph task" diff --git a/qa/suites/upgrade/client-upgrade-octopus-pacific/octopus-client-x/rbd/2-features/.qa b/qa/suites/upgrade/client-upgrade-octopus-pacific/octopus-client-x/rbd/2-features/.qa deleted file mode 120000 index a602a0353e75..000000000000 --- a/qa/suites/upgrade/client-upgrade-octopus-pacific/octopus-client-x/rbd/2-features/.qa +++ /dev/null @@ -1 +0,0 @@ -../.qa/ \ No newline at end of file diff --git a/qa/suites/upgrade/client-upgrade-octopus-pacific/octopus-client-x/rbd/2-features/defaults.yaml b/qa/suites/upgrade/client-upgrade-octopus-pacific/octopus-client-x/rbd/2-features/defaults.yaml deleted file mode 100644 index dff6623ad03d..000000000000 --- a/qa/suites/upgrade/client-upgrade-octopus-pacific/octopus-client-x/rbd/2-features/defaults.yaml +++ /dev/null @@ -1,6 +0,0 @@ -overrides: - ceph: - conf: - client: - rbd default features: 61 - diff --git a/qa/suites/upgrade/client-upgrade-octopus-pacific/octopus-client-x/rbd/2-features/layering.yaml b/qa/suites/upgrade/client-upgrade-octopus-pacific/octopus-client-x/rbd/2-features/layering.yaml deleted file mode 100644 index 5613d0155abc..000000000000 --- a/qa/suites/upgrade/client-upgrade-octopus-pacific/octopus-client-x/rbd/2-features/layering.yaml +++ /dev/null @@ -1,6 +0,0 @@ -overrides: - ceph: - conf: - client: - rbd default features: 1 - diff --git a/qa/suites/upgrade/client-upgrade-octopus-pacific/octopus-client-x/rbd/3-workload/.qa b/qa/suites/upgrade/client-upgrade-octopus-pacific/octopus-client-x/rbd/3-workload/.qa deleted file mode 120000 index a602a0353e75..000000000000 --- a/qa/suites/upgrade/client-upgrade-octopus-pacific/octopus-client-x/rbd/3-workload/.qa +++ /dev/null @@ -1 +0,0 @@ -../.qa/ \ No newline at end of file diff --git a/qa/suites/upgrade/client-upgrade-octopus-pacific/octopus-client-x/rbd/3-workload/rbd_notification_tests.yaml b/qa/suites/upgrade/client-upgrade-octopus-pacific/octopus-client-x/rbd/3-workload/rbd_notification_tests.yaml deleted file mode 100644 index 10b86530a51a..000000000000 --- a/qa/suites/upgrade/client-upgrade-octopus-pacific/octopus-client-x/rbd/3-workload/rbd_notification_tests.yaml +++ /dev/null @@ -1,36 +0,0 @@ -tasks: -- parallel: - - workunit: - branch: octopus - clients: - client.0: - - rbd/notify_master.sh - env: - RBD_FEATURES: "61" - - workunit: - #The line below to change to 'pacific' - branch: master - clients: - client.1: - - rbd/notify_slave.sh - env: - RBD_FEATURES: "61" -- print: "**** done rbd: old librbd -> new librbd" -- parallel: - - workunit: - #The line below to change to 'pacific' - branch: master - clients: - client.0: - - rbd/notify_slave.sh - env: - RBD_FEATURES: "61" - - workunit: - #The line below to change to 'pacific' - branch: master - clients: - client.1: - - rbd/notify_master.sh - env: - RBD_FEATURES: "61" -- print: "**** done rbd: new librbd -> old librbd" diff --git a/qa/suites/upgrade/client-upgrade-octopus-pacific/octopus-client-x/rbd/supported/.qa b/qa/suites/upgrade/client-upgrade-octopus-pacific/octopus-client-x/rbd/supported/.qa deleted file mode 120000 index a602a0353e75..000000000000 --- a/qa/suites/upgrade/client-upgrade-octopus-pacific/octopus-client-x/rbd/supported/.qa +++ /dev/null @@ -1 +0,0 @@ -../.qa/ \ No newline at end of file diff --git a/qa/suites/upgrade/client-upgrade-octopus-pacific/octopus-client-x/rbd/supported/ubuntu_18.04.yaml b/qa/suites/upgrade/client-upgrade-octopus-pacific/octopus-client-x/rbd/supported/ubuntu_18.04.yaml deleted file mode 120000 index 886e87fa22d5..000000000000 --- a/qa/suites/upgrade/client-upgrade-octopus-pacific/octopus-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 -- 2.47.3