qa/tests: client-upgrade-luminous-octopus tests

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

diff --git a/qa/packages/packages.yaml b/qa/packages/packages.yaml
index 6d5f7b09a7fc3d685a5b23bfb5e5dba39a034a73..4a796a14d7c74a4326a349ad40f3d139c0244a30 100644 (file)
--- a/qa/packages/packages.yaml
+++ b/qa/packages/packages.yaml
@@ -8,7 +8,10 @@ ceph:
   - ceph-fuse
   - ceph-test
   - radosgw
-  - python-ceph
+  - python-rbd
+  - python-rgw
+  - python-rados 
+  - python-cephfs
   - libcephfs2
   - libcephfs-dev
   - librados2
@@ -40,6 +43,9 @@ ceph:
   - libcephfs-devel
   - librados2
   - librbd1
-  - python-ceph
+  - python-rbd
+  - python-rgw
+  - python-rados
+  - python-cephfs
   - rbd-fuse
   - ceph-debuginfo

diff --git a/qa/suites/upgrade/client-upgrade-luminous-octopus/luminous-client-x/basic/% b/qa/suites/upgrade/client-upgrade-luminous-octopus/luminous-client-x/basic/%
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/qa/suites/upgrade/client-upgrade-luminous-octopus/luminous-client-x/basic/.qa b/qa/suites/upgrade/client-upgrade-luminous-octopus/luminous-client-x/basic/.qa
deleted file mode 120000 (symlink)
index a602a03..0000000
--- a/qa/suites/upgrade/client-upgrade-luminous-octopus/luminous-client-x/basic/.qa
+++ /dev/null
@@ -1 +0,0 @@
-../.qa/
\ No newline at end of file

diff --git a/qa/suites/upgrade/client-upgrade-luminous-octopus/luminous-client-x/basic/0-cluster/+ b/qa/suites/upgrade/client-upgrade-luminous-octopus/luminous-client-x/basic/0-cluster/+
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/qa/suites/upgrade/client-upgrade-luminous-octopus/luminous-client-x/basic/0-cluster/.qa b/qa/suites/upgrade/client-upgrade-luminous-octopus/luminous-client-x/basic/0-cluster/.qa
deleted file mode 120000 (symlink)
index a602a03..0000000
--- a/qa/suites/upgrade/client-upgrade-luminous-octopus/luminous-client-x/basic/0-cluster/.qa
+++ /dev/null
@@ -1 +0,0 @@
-../.qa/
\ No newline at end of file

diff --git a/qa/suites/upgrade/client-upgrade-luminous-octopus/luminous-client-x/basic/0-cluster/openstack.yaml b/qa/suites/upgrade/client-upgrade-luminous-octopus/luminous-client-x/basic/0-cluster/openstack.yaml
deleted file mode 100644 (file)
index b0f3b9b..0000000
--- a/qa/suites/upgrade/client-upgrade-luminous-octopus/luminous-client-x/basic/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-luminous-octopus/luminous-client-x/basic/0-cluster/start.yaml b/qa/suites/upgrade/client-upgrade-luminous-octopus/luminous-client-x/basic/0-cluster/start.yaml
deleted file mode 100644 (file)
index a8d7092..0000000
--- a/qa/suites/upgrade/client-upgrade-luminous-octopus/luminous-client-x/basic/0-cluster/start.yaml
+++ /dev/null
@@ -1,16 +0,0 @@
-roles:
-- - mon.a
-  - mon.b
-  - mon.c
-  - osd.0
-  - osd.1
-  - osd.2
-  - mgr.x
-- - client.0
-overrides:
-  ceph:
-    log-whitelist:
-    - failed to encode map
-    - CACHE_POOL_NO_HIT_SET
-    - POOL_APP_NOT_ENABLED
-    fs: xfs

diff --git a/qa/suites/upgrade/client-upgrade-luminous-octopus/luminous-client-x/basic/1-install/.qa b/qa/suites/upgrade/client-upgrade-luminous-octopus/luminous-client-x/basic/1-install/.qa
deleted file mode 120000 (symlink)
index a602a03..0000000
--- a/qa/suites/upgrade/client-upgrade-luminous-octopus/luminous-client-x/basic/1-install/.qa
+++ /dev/null
@@ -1 +0,0 @@
-../.qa/
\ No newline at end of file

diff --git a/qa/suites/upgrade/client-upgrade-luminous-octopus/luminous-client-x/basic/1-install/luminous-client-x.yaml b/qa/suites/upgrade/client-upgrade-luminous-octopus/luminous-client-x/basic/1-install/luminous-client-x.yaml
deleted file mode 100644 (file)
index 56137a9..0000000
--- a/qa/suites/upgrade/client-upgrade-luminous-octopus/luminous-client-x/basic/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','python34-cephfs','python34-rados']
-- print: "**** done install luminous"
-upgrade_workload:
-  sequential:
-  - install.upgrade:
-      exclude_packages: ['ceph-test', 'ceph-test-dbg','libcephfs1']
-      client.0:
-  - print: "**** done install.upgrade to -x on client.0"

diff --git a/qa/suites/upgrade/client-upgrade-luminous-octopus/luminous-client-x/basic/2-workload/.qa b/qa/suites/upgrade/client-upgrade-luminous-octopus/luminous-client-x/basic/2-workload/.qa
deleted file mode 120000 (symlink)
index a602a03..0000000
--- a/qa/suites/upgrade/client-upgrade-luminous-octopus/luminous-client-x/basic/2-workload/.qa
+++ /dev/null
@@ -1 +0,0 @@
-../.qa/
\ No newline at end of file

diff --git a/qa/suites/upgrade/client-upgrade-luminous-octopus/luminous-client-x/basic/2-workload/devstack-tempest-gate.yaml b/qa/suites/upgrade/client-upgrade-luminous-octopus/luminous-client-x/basic/2-workload/devstack-tempest-gate.yaml
deleted file mode 100644 (file)
index cb9ce29..0000000
--- a/qa/suites/upgrade/client-upgrade-luminous-octopus/luminous-client-x/basic/2-workload/devstack-tempest-gate.yaml
+++ /dev/null
@@ -1,56 +0,0 @@
-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-luminous-octopus/luminous-client-x/basic/supported/.qa b/qa/suites/upgrade/client-upgrade-luminous-octopus/luminous-client-x/basic/supported/.qa
deleted file mode 120000 (symlink)
index 4d575fe..0000000
--- a/qa/suites/upgrade/client-upgrade-luminous-octopus/luminous-client-x/basic/supported/.qa
+++ /dev/null
@@ -1 +0,0 @@
-../../../../.qa/
\ No newline at end of file

diff --git a/qa/suites/upgrade/client-upgrade-luminous-octopus/luminous-client-x/basic/supported/centos_7.6.yaml b/qa/suites/upgrade/client-upgrade-luminous-octopus/luminous-client-x/basic/supported/centos_7.6.yaml
deleted file mode 120000 (symlink)
index c336cfc..0000000
--- a/qa/suites/upgrade/client-upgrade-luminous-octopus/luminous-client-x/basic/supported/centos_7.6.yaml
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../../distros/all/centos_7.6.yaml
\ No newline at end of file

diff --git a/qa/suites/upgrade/client-upgrade-luminous-octopus/luminous-client-x/basic/supported/rhel_7.6.yaml b/qa/suites/upgrade/client-upgrade-luminous-octopus/luminous-client-x/basic/supported/rhel_7.6.yaml
deleted file mode 120000 (symlink)
index 4fd43cc..0000000
--- a/qa/suites/upgrade/client-upgrade-luminous-octopus/luminous-client-x/basic/supported/rhel_7.6.yaml
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../../distros/all/rhel_7.6.yaml
\ No newline at end of file

diff --git a/qa/suites/upgrade/client-upgrade-luminous-octopus/luminous-client-x/basic/supported/ubuntu_16.04.yaml b/qa/suites/upgrade/client-upgrade-luminous-octopus/luminous-client-x/basic/supported/ubuntu_16.04.yaml
deleted file mode 120000 (symlink)
index 9dc1ea9..0000000
--- a/qa/suites/upgrade/client-upgrade-luminous-octopus/luminous-client-x/basic/supported/ubuntu_16.04.yaml
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../../distros/all/ubuntu_16.04.yaml
\ No newline at end of file

diff --git a/qa/suites/upgrade/client-upgrade-luminous-octopus/luminous-client-x/rbd/supported/ubuntu_16.04.yaml b/qa/suites/upgrade/client-upgrade-luminous-octopus/luminous-client-x/rbd/supported/ubuntu_16.04.yaml
deleted file mode 120000 (symlink)
index 9dc1ea9..0000000
--- a/qa/suites/upgrade/client-upgrade-luminous-octopus/luminous-client-x/rbd/supported/ubuntu_16.04.yaml
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../../distros/all/ubuntu_16.04.yaml
\ No newline at end of file

diff --git a/qa/suites/upgrade/client-upgrade-luminous-octopus/luminous-client-x/rbd/supported/ubuntu_18.04.yaml b/qa/suites/upgrade/client-upgrade-luminous-octopus/luminous-client-x/rbd/supported/ubuntu_18.04.yaml
new file mode 120000 (symlink)
index 0000000..886e87f
--- /dev/null
+++ b/qa/suites/upgrade/client-upgrade-luminous-octopus/luminous-client-x/rbd/supported/ubuntu_18.04.yaml
@@ -0,0 +1 @@
+../../../../../../distros/all/ubuntu_18.04.yaml
\ No newline at end of file