qa/suites: clean up client-upgrade-octopus-pacific test

- fix .qa symlinks
- rename nautilus-client-x.yaml to octopus-client-x.yaml
- fix typos and remove stale comment
- remove 2-features permutation (it doesn't do anything useful as the
  workunit is run with RBD_FEATURES environment variable set and those
  features are explicitly passed to RBD.create and RBD.clone calls;
  the net effect is that the exact same job is run twice)

Signed-off-by: Ilya Dryomov <idryomov@gmail.com>

diff --git a/qa/suites/upgrade-clients/client-upgrade-octopus-pacific/octopus-client-x/rbd/.qa b/qa/suites/upgrade-clients/client-upgrade-octopus-pacific/octopus-client-x/rbd/.qa
index a602a0353e7510e9ac07370ceaed121e2e528fa2..a23f7e045836bfa41d6c79fb21549e8d3a28f315 120000 (symlink)
--- a/qa/suites/upgrade-clients/client-upgrade-octopus-pacific/octopus-client-x/rbd/.qa
+++ b/qa/suites/upgrade-clients/client-upgrade-octopus-pacific/octopus-client-x/rbd/.qa
@@ -1 +1 @@
-../.qa/
\ No newline at end of file
+../../.qa
\ No newline at end of file

diff --git a/qa/suites/upgrade-clients/client-upgrade-octopus-pacific/octopus-client-x/rbd/0-cluster/start.yaml b/qa/suites/upgrade-clients/client-upgrade-octopus-pacific/octopus-client-x/rbd/0-cluster/start.yaml
index d8910de2c36bf84e6bdf6a63e8fc9623eb4ed8ad..96af0cb0eed4cf2f40c3629556ce45a6b30047d8 100644 (file)
--- a/qa/suites/upgrade-clients/client-upgrade-octopus-pacific/octopus-client-x/rbd/0-cluster/start.yaml
+++ b/qa/suites/upgrade-clients/client-upgrade-octopus-pacific/octopus-client-x/rbd/0-cluster/start.yaml
@@ -16,6 +16,4 @@ roles:
 - - client.1
 overrides:
   ceph:
-    #log-ignorelist:
-      #- failed to encode map
     fs: xfs

diff --git a/qa/suites/upgrade-clients/client-upgrade-octopus-pacific/octopus-client-x/rbd/1-install/nautilus-client-x.yaml b/qa/suites/upgrade-clients/client-upgrade-octopus-pacific/octopus-client-x/rbd/1-install/nautilus-client-x.yaml
deleted file mode 100644 (file)
index e875802..0000000
--- a/qa/suites/upgrade-clients/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-clients/client-upgrade-octopus-pacific/octopus-client-x/rbd/1-install/octopus-client-x.yaml b/qa/suites/upgrade-clients/client-upgrade-octopus-pacific/octopus-client-x/rbd/1-install/octopus-client-x.yaml
new file mode 100644 (file)
index 0000000..571799a
--- /dev/null
+++ b/qa/suites/upgrade-clients/client-upgrade-octopus-pacific/octopus-client-x/rbd/1-install/octopus-client-x.yaml
@@ -0,0 +1,11 @@
+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.1"
+- ceph:
+- print: "**** done ceph task"

diff --git a/qa/suites/upgrade-clients/client-upgrade-octopus-pacific/octopus-client-x/rbd/2-features/.qa b/qa/suites/upgrade-clients/client-upgrade-octopus-pacific/octopus-client-x/rbd/2-features/.qa
deleted file mode 120000 (symlink)
index a602a03..0000000
--- a/qa/suites/upgrade-clients/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-clients/client-upgrade-octopus-pacific/octopus-client-x/rbd/2-features/defaults.yaml b/qa/suites/upgrade-clients/client-upgrade-octopus-pacific/octopus-client-x/rbd/2-features/defaults.yaml
deleted file mode 100644 (file)
index dff6623..0000000
--- a/qa/suites/upgrade-clients/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-clients/client-upgrade-octopus-pacific/octopus-client-x/rbd/2-features/layering.yaml b/qa/suites/upgrade-clients/client-upgrade-octopus-pacific/octopus-client-x/rbd/2-features/layering.yaml
deleted file mode 100644 (file)
index 5613d01..0000000
--- a/qa/suites/upgrade-clients/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-clients/client-upgrade-octopus-pacific/octopus-client-x/rbd/2-workload/.qa b/qa/suites/upgrade-clients/client-upgrade-octopus-pacific/octopus-client-x/rbd/2-workload/.qa
new file mode 120000 (symlink)
index 0000000..a602a03
--- /dev/null
+++ b/qa/suites/upgrade-clients/client-upgrade-octopus-pacific/octopus-client-x/rbd/2-workload/.qa
@@ -0,0 +1 @@
+../.qa/
\ No newline at end of file

diff --git a/qa/suites/upgrade-clients/client-upgrade-octopus-pacific/octopus-client-x/rbd/2-workload/rbd_notification_tests.yaml b/qa/suites/upgrade-clients/client-upgrade-octopus-pacific/octopus-client-x/rbd/2-workload/rbd_notification_tests.yaml
new file mode 100644 (file)
index 0000000..4552004
--- /dev/null
+++ b/qa/suites/upgrade-clients/client-upgrade-octopus-pacific/octopus-client-x/rbd/2-workload/rbd_notification_tests.yaml
@@ -0,0 +1,34 @@
+tasks:
+- parallel:
+  - workunit:
+      branch: octopus
+      clients:
+        client.0:
+          - rbd/notify_master.sh
+      env:
+        RBD_FEATURES: "61"
+  - workunit:
+      branch: pacific
+      clients:
+        client.1:
+          - rbd/notify_slave.sh
+      env:
+        RBD_FEATURES: "61"
+        RBD_DISABLE_UPDATE_FEATURES: "1"
+- print: "**** done rbd: old librbd -> new librbd"
+- parallel:
+  - workunit:
+      branch: octopus
+      clients:
+        client.0:
+          - rbd/notify_slave.sh
+      env:
+        RBD_FEATURES: "61"
+  - workunit:
+      branch: pacific
+      clients:
+        client.1:
+          - rbd/notify_master.sh
+      env:
+        RBD_FEATURES: "61"
+- print: "**** done rbd: new librbd -> old librbd"

diff --git a/qa/suites/upgrade-clients/client-upgrade-octopus-pacific/octopus-client-x/rbd/3-workload/.qa b/qa/suites/upgrade-clients/client-upgrade-octopus-pacific/octopus-client-x/rbd/3-workload/.qa
deleted file mode 120000 (symlink)
index a602a03..0000000
--- a/qa/suites/upgrade-clients/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-clients/client-upgrade-octopus-pacific/octopus-client-x/rbd/3-workload/rbd_notification_tests.yaml b/qa/suites/upgrade-clients/client-upgrade-octopus-pacific/octopus-client-x/rbd/3-workload/rbd_notification_tests.yaml
deleted file mode 100644 (file)
index 4552004..0000000
--- a/qa/suites/upgrade-clients/client-upgrade-octopus-pacific/octopus-client-x/rbd/3-workload/rbd_notification_tests.yaml
+++ /dev/null
@@ -1,34 +0,0 @@
-tasks:
-- parallel:
-  - workunit:
-      branch: octopus
-      clients:
-        client.0:
-          - rbd/notify_master.sh
-      env:
-        RBD_FEATURES: "61"
-  - workunit:
-      branch: pacific
-      clients:
-        client.1:
-          - rbd/notify_slave.sh
-      env:
-        RBD_FEATURES: "61"
-        RBD_DISABLE_UPDATE_FEATURES: "1"
-- print: "**** done rbd: old librbd -> new librbd"
-- parallel:
-  - workunit:
-      branch: octopus
-      clients:
-        client.0:
-          - rbd/notify_slave.sh
-      env:
-        RBD_FEATURES: "61"
-  - workunit:
-      branch: pacific
-      clients:
-        client.1:
-          - rbd/notify_master.sh
-      env:
-        RBD_FEATURES: "61"
-- print: "**** done rbd: new librbd -> old librbd"