From: Yuri Weinstein <yweinste@redhat.com>
Date: Thu, 12 Oct 2017 20:36:20 +0000 (-0700)
Subject: tests - Removed `distors` and added `supported` to run on all supported OSs
X-Git-Tag: v12.2.2~152^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=6d032e6ce33fe153958a445066a2a7ba00ffd260;p=ceph.git

tests - Removed `distors` and added `supported` to run on all supported OSs
Added `openstack` fragment to run on vps
Forced/hard-coded `machine_type=vps`
Added `print`s
Added only centos and ubuntu latest to support systemd (in distros dir)
Added `ceph osd set-require-min-compat-client luminous`

Fixes http://tracker.ceph.com/issues/21776

Signed-off-by: Yuri Weinstein <yweinste@redhat.com>
---

diff --git a/qa/suites/upgrade/jewel-x/ceph-deploy/distros/ubuntu_latest.yaml b/qa/suites/upgrade/jewel-x/ceph-deploy/distros/ubuntu_latest.yaml
new file mode 120000
index 000000000000..cc5b15bccc72
--- /dev/null
+++ b/qa/suites/upgrade/jewel-x/ceph-deploy/distros/ubuntu_latest.yaml
@@ -0,0 +1 @@
+../../../../../distros/supported/ubuntu_latest.yaml
\ No newline at end of file
diff --git a/qa/suites/upgrade/jewel-x/ceph-deploy/jewel-luminous.yaml b/qa/suites/upgrade/jewel-x/ceph-deploy/jewel-luminous.yaml
index 09ad644b6c90..9adede74f851 100644
--- a/qa/suites/upgrade/jewel-x/ceph-deploy/jewel-luminous.yaml
+++ b/qa/suites/upgrade/jewel-x/ceph-deploy/jewel-luminous.yaml
@@ -18,6 +18,15 @@ overrides:
         osd sloppy crc: true
       client:
         rbd default features: 5
+openstack:
+- machine:
+    disk: 100
+- volumes:
+    count: 3
+    size: 30
+#  reluctantely :( hard-coded machine type
+#  it will override command line args with teuthology-suite  
+machine_type: vps
 roles:
 - - mon.a
   - mds.a
@@ -37,10 +46,12 @@ roles:
   - client.0
 tasks:
 - ssh-keys:
+- print: "**** done ssh-keys"
 - ceph-deploy:
     branch:
       stable: jewel
     skip-mgr: True
+- print: "**** done initial ceph-deploy"
 - ceph-deploy.upgrade:
     branch:
       dev: luminous
@@ -50,12 +61,22 @@ tasks:
       - mon.a
       - mon.b
       - mon.c
+      - osd.6
+- print: "**** done ceph-deploy upgrade"
+- exec:
+     osd.0:
+      - ceph osd require-osd-release luminous
+      - ceph osd set-require-min-compat-client luminous
+- print: "**** done `ceph osd require-osd-release luminous`"
 - workunit:
     clients:
       all:
         - kernel_untar_build.sh
+- print: "**** done kernel_untar_build.sh"
 - systemd:
+- print: "**** done systemd"
 - workunit:
     clients:
       all:
       - rados/load-gen-mix.sh
+- print: "**** done rados/load-gen-mix.sh"