qa/tests: removed conflicting tests rbd_api_tests and rbd_import_export

and added devstack-tempest-gate.yaml instead

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

diff --git a/qa/suites/upgrade/client-upgrade-mimic/mimic-client-x/basic/1-install/mimic-client-x.yaml b/qa/suites/upgrade/client-upgrade-mimic/mimic-client-x/basic/1-install/mimic-client-x.yaml
index de2e2adf4a94d2affa97b49f950b7b2a9ef7b227..6f450de02db3c4931ac6e0708c49a27c6a631980 100644 (file)
--- a/qa/suites/upgrade/client-upgrade-mimic/mimic-client-x/basic/1-install/mimic-client-x.yaml
+++ b/qa/suites/upgrade/client-upgrade-mimic/mimic-client-x/basic/1-install/mimic-client-x.yaml
@@ -1,7 +1,7 @@
 tasks:
 - install:
     branch: mimic 
-    exclude_packages: ['ceph-mgr','libcephfs2','libcephfs-devel','libcephfs-dev']
+    exclude_packages: ['ceph-mgr','libcephfs2','libcephfs-devel','libcephfs-dev','python34-cephfs','python34-rados']
 - print: "**** done install mimic"
 upgrade_workload:
   sequential:

diff --git a/qa/suites/upgrade/client-upgrade-mimic/mimic-client-x/basic/2-workload/devstack-tempest-gate.yaml b/qa/suites/upgrade/client-upgrade-mimic/mimic-client-x/basic/2-workload/devstack-tempest-gate.yaml
new file mode 100644 (file)
index 0000000..cb9ce29
--- /dev/null
+++ b/qa/suites/upgrade/client-upgrade-mimic/mimic-client-x/basic/2-workload/devstack-tempest-gate.yaml
@@ -0,0 +1,56 @@
+tasks:
+- sequential:
+  - upgrade_workload
+- ceph: 
+- print: "**** done ceph"
+- qemu:
+    client.0:
+      type: filesystem
+      cpus: 4
+      memory: 12288
+      disks:
+      - image_size: 30720
+      - image_size: 30720
+      test: qa/workunits/rbd/run_devstack_tempest.sh
+      image_url: https://cloud-images.ubuntu.com/releases/16.04/release/ubuntu-16.04-server-cloudimg-amd64-disk1.img
+      cloud_config_archive:
+      - type: text/cloud-config
+        content: |
+          users:
+          - name: stack
+            lock_passwd: False
+            shell: /bin/bash
+            sudo: ["ALL=(root) NOPASSWD:ALL\nDefaults:stack,tempest !requiretty"]
+          - name: tempest
+            lock_passwd: False
+            shell: /bin/bash
+            sudo:
+            - "ALL=(root) NOPASSWD:/sbin/ip"
+            - "ALL=(root) NOPASSWD:/sbin/iptables"
+            - "ALL=(root) NOPASSWD:/usr/bin/ovsdb-client"
+      - |
+        #!/bin/bash -ex
+        wget -q -O- "http://git.ceph.com/?p=ceph.git;a=blob_plain;f=keys/autobuild.asc" | apt-key add -
+        wget -q -O /etc/apt/sources.list.d/ceph.list "https://shaman.ceph.com/api/repos/ceph/{ceph_branch}/{ceph_sha1}/ubuntu/xenial/repo"
+        apt-get update
+
+        mount --bind /mnt/test_b /opt
+        mkdir /opt/stack
+        chown -R stack:stack /home/stack
+        chown -R stack:stack /opt/stack
+
+        mkdir /mnt/log/stack
+        chmod a+rwx /mnt/log/stack
+        chown -R stack:stack /mnt/log/stack
+
+        apt-get install -y ceph-common librbd1
+
+        mkdir /mnt/log/stack/ceph
+        chown -R stack:stack /mnt/log/stack/ceph
+        chmod a+rwx /mnt/log/stack/ceph
+
+        # sanity check that the cluster is reachable from the VM
+        echo '[client]' >> /etc/ceph/ceph.conf
+        echo 'log file = /mnt/log/stack/ceph/$name.$pid.log' >> /etc/ceph/ceph.conf
+        rbd --debug-ms=10 --debug-rbd=20 info client.0.1
+- print: "**** done qemu task!"

diff --git a/qa/suites/upgrade/client-upgrade-mimic/mimic-client-x/basic/2-workload/rbd_api_tests.yaml b/qa/suites/upgrade/client-upgrade-mimic/mimic-client-x/basic/2-workload/rbd_api_tests.yaml
deleted file mode 100644 (file)
index a60c38a..0000000
--- a/qa/suites/upgrade/client-upgrade-mimic/mimic-client-x/basic/2-workload/rbd_api_tests.yaml
+++ /dev/null
@@ -1,21 +0,0 @@
-tasks:
-- exec:
-    client.0:
-    - "cp $(which ceph_test_librbd_api) $TESTDIR/ceph_test_librbd_api"
-- sequential:
-  - upgrade_workload
-- ceph: 
-- print: "**** done ceph"
-- exec:
-    client.0:
-    - "cp --force $TESTDIR/ceph_test_librbd_api $(which ceph_test_librbd_api)"
-    - "rm -rf $TESTDIR/ceph_test_librbd_api"
-- print: "**** done reverting to luminous ceph_test_librbd_api"
-- workunit:
-    branch: mimic
-    clients:
-      client.0:
-      - rbd/test_librbd_api.sh
-    env:
-      RBD_FEATURES: "61"
-- print: "**** done rbd/test_librbd_api.sh"

diff --git a/qa/suites/upgrade/client-upgrade-mimic/mimic-client-x/basic/2-workload/rbd_cli_import_export.yaml b/qa/suites/upgrade/client-upgrade-mimic/mimic-client-x/basic/2-workload/rbd_cli_import_export.yaml
deleted file mode 100644 (file)
index e229549..0000000
--- a/qa/suites/upgrade/client-upgrade-mimic/mimic-client-x/basic/2-workload/rbd_cli_import_export.yaml
+++ /dev/null
@@ -1,11 +0,0 @@
-tasks:
-- sequential:
-  - upgrade_workload
-- ceph: 
-- print: "**** done ceph"
-- workunit:
-    branch: mimic
-    clients:
-      client.0:
-      - rbd/import_export.sh
-- print: "**** done rbd/import_export.sh"

diff --git a/qa/suites/upgrade/client-upgrade-mimic/mimic-client-x/rbd/1-install/luminous-client-x.yaml b/qa/suites/upgrade/client-upgrade-mimic/mimic-client-x/rbd/1-install/luminous-client-x.yaml
deleted file mode 100644 (file)
index 4a45535..0000000
--- a/qa/suites/upgrade/client-upgrade-mimic/mimic-client-x/rbd/1-install/luminous-client-x.yaml
+++ /dev/null
@@ -1,11 +0,0 @@
-tasks:
-- install:
-    branch: luminous
-    exclude_packages: ['ceph-mgr','libcephfs2','libcephfs-devel','libcephfs-dev']
-- print: "**** done install luminous"
-- install.upgrade:
-   exclude_packages: ['ceph-test', 'ceph-test-dbg','libcephfs1']
-   client.1:
-- print: "**** done install.upgrade to -x on client.0"
-- ceph:
-- print: "**** done ceph task"

diff --git a/qa/suites/upgrade/client-upgrade-mimic/mimic-client-x/rbd/1-install/mimic-client-x.yaml b/qa/suites/upgrade/client-upgrade-mimic/mimic-client-x/rbd/1-install/mimic-client-x.yaml
new file mode 100644 (file)
index 0000000..41dd09f
--- /dev/null
+++ b/qa/suites/upgrade/client-upgrade-mimic/mimic-client-x/rbd/1-install/mimic-client-x.yaml
@@ -0,0 +1,11 @@
+tasks:
+- install:
+    branch: mimic
+    exclude_packages: ['ceph-mgr','libcephfs2','libcephfs-devel','libcephfs-dev','python34-cephfs','python34-rados']
+- print: "**** done install mimic"
+- install.upgrade:
+   exclude_packages: ['ceph-test', 'ceph-test-dbg','libcephfs1']
+   client.1:
+- print: "**** done install.upgrade to -x on client.0"
+- ceph:
+- print: "**** done ceph task"