From: Sage Weil <sage@redhat.com>
Date: Fri, 10 Feb 2017 20:08:54 +0000 (-0500)
Subject: qa/rados/upgrade/jewel-x-singleton: run luminous.yaml at the end
X-Git-Tag: v12.0.1~435^2
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=6e998b2f8ca80a84166b8378250d388f395eb3db;p=ceph-ci.git

qa/rados/upgrade/jewel-x-singleton: run luminous.yaml at the end

renumber too

Signed-off-by: Sage Weil <sage@redhat.com>
---

diff --git a/qa/releases/luminous.yaml b/qa/releases/luminous.yaml
new file mode 100644
index 00000000000..d6012ffcac1
--- /dev/null
+++ b/qa/releases/luminous.yaml
@@ -0,0 +1,9 @@
+tasks:
+- exec:
+    osd.0:
+      - ceph osd set require_luminous_osds
+overrides:
+  ceph:
+    conf:
+      mon:
+        mon warn on osd down out interval zero: false
\ No newline at end of file
diff --git a/qa/suites/rados/upgrade/jewel-x-singleton/4-workload/+ b/qa/suites/rados/upgrade/jewel-x-singleton/4-workload/+
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/qa/suites/rados/upgrade/jewel-x-singleton/4-workload/rbd-cls.yaml b/qa/suites/rados/upgrade/jewel-x-singleton/4-workload/rbd-cls.yaml
new file mode 100644
index 00000000000..e35bfc2208d
--- /dev/null
+++ b/qa/suites/rados/upgrade/jewel-x-singleton/4-workload/rbd-cls.yaml
@@ -0,0 +1,11 @@
+meta:
+- desc: |
+   run basic cls tests for rbd
+split_tasks:
+  sequential:
+  - workunit:
+      branch: jewel
+      clients:
+        client.0:
+          - cls/test_cls_rbd.sh
+  - print: "**** done cls/test_cls_rbd.sh 5-workload"
diff --git a/qa/suites/rados/upgrade/jewel-x-singleton/4-workload/rbd-import-export.yaml b/qa/suites/rados/upgrade/jewel-x-singleton/4-workload/rbd-import-export.yaml
new file mode 100644
index 00000000000..9d6c2e23296
--- /dev/null
+++ b/qa/suites/rados/upgrade/jewel-x-singleton/4-workload/rbd-import-export.yaml
@@ -0,0 +1,13 @@
+meta:
+- desc: |
+   run basic import/export cli tests for rbd
+split_tasks:
+  sequential:
+  - workunit:
+      branch: jewel
+      clients:
+        client.0:
+          - rbd/import_export.sh
+      env:
+        RBD_CREATE_ARGS: --new-format
+  - print: "**** done rbd/import_export.sh 5-workload"
diff --git a/qa/suites/rados/upgrade/jewel-x-singleton/4-workload/readwrite.yaml b/qa/suites/rados/upgrade/jewel-x-singleton/4-workload/readwrite.yaml
new file mode 100644
index 00000000000..0382520a09e
--- /dev/null
+++ b/qa/suites/rados/upgrade/jewel-x-singleton/4-workload/readwrite.yaml
@@ -0,0 +1,17 @@
+meta:
+- desc: |
+   randomized correctness test for rados operations on a replicated pool, 
+   using only reads, writes, and deletes
+split_tasks:
+  sequential:
+  - full_sequential:
+    - rados:
+        clients: [client.0]
+        ops: 4000
+        objects: 500
+        write_append_excl: false
+        op_weights:
+          read: 45
+          write: 45
+          delete: 10
+  - print: "**** done rados/readwrite 5-workload"
diff --git a/qa/suites/rados/upgrade/jewel-x-singleton/4-workload/snaps-few-objects.yaml b/qa/suites/rados/upgrade/jewel-x-singleton/4-workload/snaps-few-objects.yaml
new file mode 100644
index 00000000000..c96cfbe3004
--- /dev/null
+++ b/qa/suites/rados/upgrade/jewel-x-singleton/4-workload/snaps-few-objects.yaml
@@ -0,0 +1,19 @@
+meta:
+- desc: |
+   randomized correctness test for rados operations on a replicated pool with snapshot operations
+split_tasks:
+  sequential:
+  - full_sequential:
+    - rados:
+        clients: [client.0]
+        ops: 4000
+        objects: 50
+        write_append_excl: false
+        op_weights:
+          read: 100
+          write: 100
+          delete: 50
+          snap_create: 50
+          snap_remove: 50
+          rollback: 50
+  - print: "**** done rados/snaps-few-objects 5-workload"
diff --git a/qa/suites/rados/upgrade/jewel-x-singleton/5-workload/radosbench.yaml b/qa/suites/rados/upgrade/jewel-x-singleton/5-workload/radosbench.yaml
new file mode 100644
index 00000000000..2cfbf1dcff5
--- /dev/null
+++ b/qa/suites/rados/upgrade/jewel-x-singleton/5-workload/radosbench.yaml
@@ -0,0 +1,41 @@
+meta:
+- desc: |
+   run randomized correctness test for rados operations
+   generate write load with rados bench
+split_tasks:
+  sequential:
+  - full_sequential:
+    - radosbench:
+        clients: [client.0]
+        time: 150
+    - radosbench:
+        clients: [client.0]
+        time: 150
+    - radosbench:
+        clients: [client.0]
+        time: 150
+    - radosbench:
+        clients: [client.0]
+        time: 150
+    - radosbench:
+        clients: [client.0]
+        time: 150
+    - radosbench:
+        clients: [client.0]
+        time: 150
+    - radosbench:
+        clients: [client.0]
+        time: 150
+    - radosbench:
+        clients: [client.0]
+        time: 150
+    - radosbench:
+        clients: [client.0]
+        time: 150
+    - radosbench:
+        clients: [client.0]
+        time: 150
+    - radosbench:
+        clients: [client.0]
+        time: 150
+  - print: "**** done radosbench 7-workload"
diff --git a/qa/suites/rados/upgrade/jewel-x-singleton/5-workload/rbd-cls.yaml b/qa/suites/rados/upgrade/jewel-x-singleton/5-workload/rbd-cls.yaml
deleted file mode 100644
index e35bfc2208d..00000000000
--- a/qa/suites/rados/upgrade/jewel-x-singleton/5-workload/rbd-cls.yaml
+++ /dev/null
@@ -1,11 +0,0 @@
-meta:
-- desc: |
-   run basic cls tests for rbd
-split_tasks:
-  sequential:
-  - workunit:
-      branch: jewel
-      clients:
-        client.0:
-          - cls/test_cls_rbd.sh
-  - print: "**** done cls/test_cls_rbd.sh 5-workload"
diff --git a/qa/suites/rados/upgrade/jewel-x-singleton/5-workload/rbd-import-export.yaml b/qa/suites/rados/upgrade/jewel-x-singleton/5-workload/rbd-import-export.yaml
deleted file mode 100644
index 9d6c2e23296..00000000000
--- a/qa/suites/rados/upgrade/jewel-x-singleton/5-workload/rbd-import-export.yaml
+++ /dev/null
@@ -1,13 +0,0 @@
-meta:
-- desc: |
-   run basic import/export cli tests for rbd
-split_tasks:
-  sequential:
-  - workunit:
-      branch: jewel
-      clients:
-        client.0:
-          - rbd/import_export.sh
-      env:
-        RBD_CREATE_ARGS: --new-format
-  - print: "**** done rbd/import_export.sh 5-workload"
diff --git a/qa/suites/rados/upgrade/jewel-x-singleton/5-workload/rbd_api.yaml b/qa/suites/rados/upgrade/jewel-x-singleton/5-workload/rbd_api.yaml
new file mode 100644
index 00000000000..22a5f5750d3
--- /dev/null
+++ b/qa/suites/rados/upgrade/jewel-x-singleton/5-workload/rbd_api.yaml
@@ -0,0 +1,11 @@
+meta:
+- desc: |
+   librbd C and C++ api tests
+split_tasks:
+  sequential:
+  - workunit:
+      branch: jewel
+      clients:
+        client.0:
+           - rbd/test_librbd.sh
+  - print: "**** done rbd/test_librbd.sh 7-workload"
diff --git a/qa/suites/rados/upgrade/jewel-x-singleton/5-workload/readwrite.yaml b/qa/suites/rados/upgrade/jewel-x-singleton/5-workload/readwrite.yaml
deleted file mode 100644
index 0382520a09e..00000000000
--- a/qa/suites/rados/upgrade/jewel-x-singleton/5-workload/readwrite.yaml
+++ /dev/null
@@ -1,17 +0,0 @@
-meta:
-- desc: |
-   randomized correctness test for rados operations on a replicated pool, 
-   using only reads, writes, and deletes
-split_tasks:
-  sequential:
-  - full_sequential:
-    - rados:
-        clients: [client.0]
-        ops: 4000
-        objects: 500
-        write_append_excl: false
-        op_weights:
-          read: 45
-          write: 45
-          delete: 10
-  - print: "**** done rados/readwrite 5-workload"
diff --git a/qa/suites/rados/upgrade/jewel-x-singleton/5-workload/snaps-few-objects.yaml b/qa/suites/rados/upgrade/jewel-x-singleton/5-workload/snaps-few-objects.yaml
deleted file mode 100644
index c96cfbe3004..00000000000
--- a/qa/suites/rados/upgrade/jewel-x-singleton/5-workload/snaps-few-objects.yaml
+++ /dev/null
@@ -1,19 +0,0 @@
-meta:
-- desc: |
-   randomized correctness test for rados operations on a replicated pool with snapshot operations
-split_tasks:
-  sequential:
-  - full_sequential:
-    - rados:
-        clients: [client.0]
-        ops: 4000
-        objects: 50
-        write_append_excl: false
-        op_weights:
-          read: 100
-          write: 100
-          delete: 50
-          snap_create: 50
-          snap_remove: 50
-          rollback: 50
-  - print: "**** done rados/snaps-few-objects 5-workload"
diff --git a/qa/suites/rados/upgrade/jewel-x-singleton/6-finish-upgrade.yaml b/qa/suites/rados/upgrade/jewel-x-singleton/6-finish-upgrade.yaml
new file mode 100644
index 00000000000..b48d2a0e3ce
--- /dev/null
+++ b/qa/suites/rados/upgrade/jewel-x-singleton/6-finish-upgrade.yaml
@@ -0,0 +1,11 @@
+meta:
+- desc: |
+    install upgrade on remaining node
+    restartin remaining osds
+tasks:
+- install.upgrade:
+    osd.3:
+- ceph.restart:
+    daemons: [osd.3, osd.4, osd.5]
+    wait-for-up: true
+    wait-for-healthy: false
diff --git a/qa/suites/rados/upgrade/jewel-x-singleton/7-luminous.yaml b/qa/suites/rados/upgrade/jewel-x-singleton/7-luminous.yaml
new file mode 120000
index 00000000000..5283ac73e1b
--- /dev/null
+++ b/qa/suites/rados/upgrade/jewel-x-singleton/7-luminous.yaml
@@ -0,0 +1 @@
+../../../../releases/luminous.yaml
\ No newline at end of file
diff --git a/qa/suites/rados/upgrade/jewel-x-singleton/7-workload/+ b/qa/suites/rados/upgrade/jewel-x-singleton/7-workload/+
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/qa/suites/rados/upgrade/jewel-x-singleton/7-workload/radosbench.yaml b/qa/suites/rados/upgrade/jewel-x-singleton/7-workload/radosbench.yaml
deleted file mode 100644
index 2cfbf1dcff5..00000000000
--- a/qa/suites/rados/upgrade/jewel-x-singleton/7-workload/radosbench.yaml
+++ /dev/null
@@ -1,41 +0,0 @@
-meta:
-- desc: |
-   run randomized correctness test for rados operations
-   generate write load with rados bench
-split_tasks:
-  sequential:
-  - full_sequential:
-    - radosbench:
-        clients: [client.0]
-        time: 150
-    - radosbench:
-        clients: [client.0]
-        time: 150
-    - radosbench:
-        clients: [client.0]
-        time: 150
-    - radosbench:
-        clients: [client.0]
-        time: 150
-    - radosbench:
-        clients: [client.0]
-        time: 150
-    - radosbench:
-        clients: [client.0]
-        time: 150
-    - radosbench:
-        clients: [client.0]
-        time: 150
-    - radosbench:
-        clients: [client.0]
-        time: 150
-    - radosbench:
-        clients: [client.0]
-        time: 150
-    - radosbench:
-        clients: [client.0]
-        time: 150
-    - radosbench:
-        clients: [client.0]
-        time: 150
-  - print: "**** done radosbench 7-workload"
diff --git a/qa/suites/rados/upgrade/jewel-x-singleton/7-workload/rbd_api.yaml b/qa/suites/rados/upgrade/jewel-x-singleton/7-workload/rbd_api.yaml
deleted file mode 100644
index 22a5f5750d3..00000000000
--- a/qa/suites/rados/upgrade/jewel-x-singleton/7-workload/rbd_api.yaml
+++ /dev/null
@@ -1,11 +0,0 @@
-meta:
-- desc: |
-   librbd C and C++ api tests
-split_tasks:
-  sequential:
-  - workunit:
-      branch: jewel
-      clients:
-        client.0:
-           - rbd/test_librbd.sh
-  - print: "**** done rbd/test_librbd.sh 7-workload"
diff --git a/qa/suites/rados/upgrade/jewel-x-singleton/8-finish-upgrade.yaml b/qa/suites/rados/upgrade/jewel-x-singleton/8-finish-upgrade.yaml
deleted file mode 100644
index 7f1632751e8..00000000000
--- a/qa/suites/rados/upgrade/jewel-x-singleton/8-finish-upgrade.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-meta:
-- desc: |
-    install upgrade on remaining node
-    restartin remaining osds
-tasks:
-- install.upgrade:
-    osd.3:
-- ceph.restart:
-    daemons: [osd.3, osd.4, osd.5]
diff --git a/qa/suites/rados/upgrade/jewel-x-singleton/8-workload/+ b/qa/suites/rados/upgrade/jewel-x-singleton/8-workload/+
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/qa/suites/rados/upgrade/jewel-x-singleton/8-workload/rbd-python.yaml b/qa/suites/rados/upgrade/jewel-x-singleton/8-workload/rbd-python.yaml
new file mode 100644
index 00000000000..8da34579c81
--- /dev/null
+++ b/qa/suites/rados/upgrade/jewel-x-singleton/8-workload/rbd-python.yaml
@@ -0,0 +1,10 @@
+meta:
+- desc: |
+   librbd python api tests
+tasks:
+- workunit:
+    branch: jewel
+    clients:
+      client.0:
+        - rbd/test_librbd_python.sh
+- print: "**** done rbd/test_librbd_python.sh 9-workload"
diff --git a/qa/suites/rados/upgrade/jewel-x-singleton/8-workload/rgw-swift.yaml b/qa/suites/rados/upgrade/jewel-x-singleton/8-workload/rgw-swift.yaml
new file mode 100644
index 00000000000..ba004ceac63
--- /dev/null
+++ b/qa/suites/rados/upgrade/jewel-x-singleton/8-workload/rgw-swift.yaml
@@ -0,0 +1,12 @@
+meta:
+- desc: |
+   swift api tests for rgw
+tasks:
+- rgw: 
+    client.0:
+    default_idle_timeout: 300
+- print: "**** done rgw 9-workload"
+- swift:
+    client.0:
+      rgw_server: client.0
+- print: "**** done swift 9-workload"
diff --git a/qa/suites/rados/upgrade/jewel-x-singleton/8-workload/snaps-many-objects.yaml b/qa/suites/rados/upgrade/jewel-x-singleton/8-workload/snaps-many-objects.yaml
new file mode 100644
index 00000000000..805bf97c379
--- /dev/null
+++ b/qa/suites/rados/upgrade/jewel-x-singleton/8-workload/snaps-many-objects.yaml
@@ -0,0 +1,16 @@
+meta:
+- desc: |
+   randomized correctness test for rados operations on a replicated pool with snapshot operations
+tasks:
+- rados:
+    clients: [client.0]
+    ops: 4000
+    objects: 500
+    write_append_excl: false
+    op_weights:
+      read: 100
+      write: 100
+      delete: 50
+      snap_create: 50
+      snap_remove: 50
+      rollback: 50
diff --git a/qa/suites/rados/upgrade/jewel-x-singleton/9-workload/+ b/qa/suites/rados/upgrade/jewel-x-singleton/9-workload/+
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/qa/suites/rados/upgrade/jewel-x-singleton/9-workload/rbd-python.yaml b/qa/suites/rados/upgrade/jewel-x-singleton/9-workload/rbd-python.yaml
deleted file mode 100644
index 8da34579c81..00000000000
--- a/qa/suites/rados/upgrade/jewel-x-singleton/9-workload/rbd-python.yaml
+++ /dev/null
@@ -1,10 +0,0 @@
-meta:
-- desc: |
-   librbd python api tests
-tasks:
-- workunit:
-    branch: jewel
-    clients:
-      client.0:
-        - rbd/test_librbd_python.sh
-- print: "**** done rbd/test_librbd_python.sh 9-workload"
diff --git a/qa/suites/rados/upgrade/jewel-x-singleton/9-workload/rgw-swift.yaml b/qa/suites/rados/upgrade/jewel-x-singleton/9-workload/rgw-swift.yaml
deleted file mode 100644
index ba004ceac63..00000000000
--- a/qa/suites/rados/upgrade/jewel-x-singleton/9-workload/rgw-swift.yaml
+++ /dev/null
@@ -1,12 +0,0 @@
-meta:
-- desc: |
-   swift api tests for rgw
-tasks:
-- rgw: 
-    client.0:
-    default_idle_timeout: 300
-- print: "**** done rgw 9-workload"
-- swift:
-    client.0:
-      rgw_server: client.0
-- print: "**** done swift 9-workload"
diff --git a/qa/suites/rados/upgrade/jewel-x-singleton/9-workload/snaps-many-objects.yaml b/qa/suites/rados/upgrade/jewel-x-singleton/9-workload/snaps-many-objects.yaml
deleted file mode 100644
index 805bf97c379..00000000000
--- a/qa/suites/rados/upgrade/jewel-x-singleton/9-workload/snaps-many-objects.yaml
+++ /dev/null
@@ -1,16 +0,0 @@
-meta:
-- desc: |
-   randomized correctness test for rados operations on a replicated pool with snapshot operations
-tasks:
-- rados:
-    clients: [client.0]
-    ops: 4000
-    objects: 500
-    write_append_excl: false
-    op_weights:
-      read: 100
-      write: 100
-      delete: 50
-      snap_create: 50
-      snap_remove: 50
-      rollback: 50