From fa22a970bcf34408c03a729afa3bae4bffc96c91 Mon Sep 17 00:00:00 2001 From: Tamil Muthamizhan Date: Wed, 21 Dec 2016 16:03:31 -0800 Subject: [PATCH] Added a smoke suite for ceph-ansible Smoke suite with basic tests for ceph ansible deployment Signed-off-by: Tamil Muthamizhan (cherry picked from commit ad9b75f8d0ccca1aa2dfc8679196643433634687) --- .../ceph-ansible/smoke/0-clusters/3-node.yaml | 6 ----- .../smoke/0-clusters/single_mon_osd.yaml | 4 ---- qa/suites/ceph-ansible/smoke/1-distros | 1 - .../smoke/2-setup/ceph_ansible.yaml | 19 --------------- qa/suites/ceph-ansible/smoke/3-common/% | 0 .../smoke/3-common/os_tuning/vm_friendly.yaml | 6 ----- .../3-common/source/upstream_stable.yaml | 7 ------ qa/suites/ceph-ansible/smoke/4-osd/% | 0 .../smoke/4-osd/devices/from_teuthology.yaml | 6 ----- .../4-osd/devices/osd_auto_discovery.yaml | 6 ----- .../smoke/4-osd/journal/collocated.yaml | 7 ------ qa/suites/ceph-ansible/smoke/{ => basic}/% | 0 .../smoke/basic/0-clusters/3-node.yaml | 6 +++++ .../smoke/basic/1-distros/centos_7.2.yaml | 2 ++ .../smoke/basic/1-distros/ubuntu_14.04.yaml | 2 ++ .../smoke/basic/1-distros/ubuntu_16.04.yaml | 2 ++ .../smoke/basic/2-config/ceph_ansible.yaml | 23 +++++++++++++++++++ .../3-tasks}/ceph-admin-commands.yaml | 0 .../cfuse_workunit_suites_blogbench.yaml | 8 +++++++ .../smoke/{5-tests => basic/3-tasks}/cls.yaml | 0 .../3-tasks/rbd_cli_tests.yaml} | 0 .../3-tasks}/rbd_import_export.yaml | 0 22 files changed, 43 insertions(+), 62 deletions(-) delete mode 100644 qa/suites/ceph-ansible/smoke/0-clusters/3-node.yaml delete mode 100644 qa/suites/ceph-ansible/smoke/0-clusters/single_mon_osd.yaml delete mode 120000 qa/suites/ceph-ansible/smoke/1-distros delete mode 100644 qa/suites/ceph-ansible/smoke/2-setup/ceph_ansible.yaml delete mode 100644 qa/suites/ceph-ansible/smoke/3-common/% delete mode 100644 qa/suites/ceph-ansible/smoke/3-common/os_tuning/vm_friendly.yaml delete mode 100644 qa/suites/ceph-ansible/smoke/3-common/source/upstream_stable.yaml delete mode 100644 qa/suites/ceph-ansible/smoke/4-osd/% delete mode 100644 qa/suites/ceph-ansible/smoke/4-osd/devices/from_teuthology.yaml delete mode 100644 qa/suites/ceph-ansible/smoke/4-osd/devices/osd_auto_discovery.yaml delete mode 100644 qa/suites/ceph-ansible/smoke/4-osd/journal/collocated.yaml rename qa/suites/ceph-ansible/smoke/{ => basic}/% (100%) create mode 100644 qa/suites/ceph-ansible/smoke/basic/0-clusters/3-node.yaml create mode 100644 qa/suites/ceph-ansible/smoke/basic/1-distros/centos_7.2.yaml create mode 100644 qa/suites/ceph-ansible/smoke/basic/1-distros/ubuntu_14.04.yaml create mode 100644 qa/suites/ceph-ansible/smoke/basic/1-distros/ubuntu_16.04.yaml create mode 100644 qa/suites/ceph-ansible/smoke/basic/2-config/ceph_ansible.yaml rename qa/suites/ceph-ansible/smoke/{5-tests => basic/3-tasks}/ceph-admin-commands.yaml (100%) create mode 100644 qa/suites/ceph-ansible/smoke/basic/3-tasks/cfuse_workunit_suites_blogbench.yaml rename qa/suites/ceph-ansible/smoke/{5-tests => basic/3-tasks}/cls.yaml (100%) rename qa/suites/ceph-ansible/smoke/{5-tests/rbd_cli_tests.yaml.disabled => basic/3-tasks/rbd_cli_tests.yaml} (100%) rename qa/suites/ceph-ansible/smoke/{5-tests => basic/3-tasks}/rbd_import_export.yaml (100%) diff --git a/qa/suites/ceph-ansible/smoke/0-clusters/3-node.yaml b/qa/suites/ceph-ansible/smoke/0-clusters/3-node.yaml deleted file mode 100644 index 2289a1ec5fb7d..0000000000000 --- a/qa/suites/ceph-ansible/smoke/0-clusters/3-node.yaml +++ /dev/null @@ -1,6 +0,0 @@ -meta: -- desc: "3-node cluster" -roles: -- [mon.a, mds.a, osd.0, osd.1, client.0] -- [mon.b, mds.b, osd.2, osd.3] -- [mon.c, mds.c, osd.4, osd.5] diff --git a/qa/suites/ceph-ansible/smoke/0-clusters/single_mon_osd.yaml b/qa/suites/ceph-ansible/smoke/0-clusters/single_mon_osd.yaml deleted file mode 100644 index 6905fab9522ff..0000000000000 --- a/qa/suites/ceph-ansible/smoke/0-clusters/single_mon_osd.yaml +++ /dev/null @@ -1,4 +0,0 @@ -meta: -- desc: "1-node cluster" -roles: - - [mon.a, osd.0, client.0] diff --git a/qa/suites/ceph-ansible/smoke/1-distros b/qa/suites/ceph-ansible/smoke/1-distros deleted file mode 120000 index c5d59352cb5ea..0000000000000 --- a/qa/suites/ceph-ansible/smoke/1-distros +++ /dev/null @@ -1 +0,0 @@ -../../../distros/supported \ No newline at end of file diff --git a/qa/suites/ceph-ansible/smoke/2-setup/ceph_ansible.yaml b/qa/suites/ceph-ansible/smoke/2-setup/ceph_ansible.yaml deleted file mode 100644 index 693717f3ad939..0000000000000 --- a/qa/suites/ceph-ansible/smoke/2-setup/ceph_ansible.yaml +++ /dev/null @@ -1,19 +0,0 @@ -meta: -- desc: "Build the cluster using ceph-ansible; then check health and make the keyring readable" -tasks: -- ceph_ansible: -- exec: - mon.a: - - "sudo ceph health" -- exec: - all: - - "KEYRING=/etc/ceph/ceph.client.admin.keyring; test -f $KEYRING && sudo chmod o+r $KEYRING" -- install.ship_utilities: -overrides: - ceph_ansible: - vars: - ceph_test: true -openstack: - - volumes: - count: 3 - size: 20 # GB diff --git a/qa/suites/ceph-ansible/smoke/3-common/% b/qa/suites/ceph-ansible/smoke/3-common/% deleted file mode 100644 index e69de29bb2d1d..0000000000000 diff --git a/qa/suites/ceph-ansible/smoke/3-common/os_tuning/vm_friendly.yaml b/qa/suites/ceph-ansible/smoke/3-common/os_tuning/vm_friendly.yaml deleted file mode 100644 index a5ea8d88712ce..0000000000000 --- a/qa/suites/ceph-ansible/smoke/3-common/os_tuning/vm_friendly.yaml +++ /dev/null @@ -1,6 +0,0 @@ -meta: -- desc: "Set os_tuning_params to values that are safe for VMs" -overrides: - ceph_ansible: - vars: - os_tuning_params: '[{"name": "kernel.pid_max", "value": 4194303},{"name": "fs.file-max", "value": 26234859}]' diff --git a/qa/suites/ceph-ansible/smoke/3-common/source/upstream_stable.yaml b/qa/suites/ceph-ansible/smoke/3-common/source/upstream_stable.yaml deleted file mode 100644 index 352ca4db38269..0000000000000 --- a/qa/suites/ceph-ansible/smoke/3-common/source/upstream_stable.yaml +++ /dev/null @@ -1,7 +0,0 @@ -meta: -- desc: "Use a stable upstream Ceph release" -overrides: - ceph_ansible: - vars: - ceph_origin: upstream - ceph_stable: true diff --git a/qa/suites/ceph-ansible/smoke/4-osd/% b/qa/suites/ceph-ansible/smoke/4-osd/% deleted file mode 100644 index e69de29bb2d1d..0000000000000 diff --git a/qa/suites/ceph-ansible/smoke/4-osd/devices/from_teuthology.yaml b/qa/suites/ceph-ansible/smoke/4-osd/devices/from_teuthology.yaml deleted file mode 100644 index 6b824842a7561..0000000000000 --- a/qa/suites/ceph-ansible/smoke/4-osd/devices/from_teuthology.yaml +++ /dev/null @@ -1,6 +0,0 @@ -meta: -- desc: "Have teuthology tell ceph-ansible which OSD devices to use" -overrides: - ceph_ansible: - vars: - osd_auto_discovery: false diff --git a/qa/suites/ceph-ansible/smoke/4-osd/devices/osd_auto_discovery.yaml b/qa/suites/ceph-ansible/smoke/4-osd/devices/osd_auto_discovery.yaml deleted file mode 100644 index 04f697a1aea89..0000000000000 --- a/qa/suites/ceph-ansible/smoke/4-osd/devices/osd_auto_discovery.yaml +++ /dev/null @@ -1,6 +0,0 @@ -meta: -- desc: "Tell ceph-ansible to discover OSD devices automatically" -overrides: - ceph_ansible: - vars: - osd_auto_discovery: true diff --git a/qa/suites/ceph-ansible/smoke/4-osd/journal/collocated.yaml b/qa/suites/ceph-ansible/smoke/4-osd/journal/collocated.yaml deleted file mode 100644 index 2a60eaf8cefa3..0000000000000 --- a/qa/suites/ceph-ansible/smoke/4-osd/journal/collocated.yaml +++ /dev/null @@ -1,7 +0,0 @@ -meta: -- desc: "Use a collocated journal" -overrides: - ceph_ansible: - vars: - journal_collocation: true - journal_size: 1024 diff --git a/qa/suites/ceph-ansible/smoke/% b/qa/suites/ceph-ansible/smoke/basic/% similarity index 100% rename from qa/suites/ceph-ansible/smoke/% rename to qa/suites/ceph-ansible/smoke/basic/% diff --git a/qa/suites/ceph-ansible/smoke/basic/0-clusters/3-node.yaml b/qa/suites/ceph-ansible/smoke/basic/0-clusters/3-node.yaml new file mode 100644 index 0000000000000..84f45b28d3a01 --- /dev/null +++ b/qa/suites/ceph-ansible/smoke/basic/0-clusters/3-node.yaml @@ -0,0 +1,6 @@ +meta: +- desc: "3-node cluster" +roles: +- [mon.a, mds.a, osd.0, osd.1, osd.2] +- [mon.b, osd.3, osd.4, osd.5] +- [mon.c, osd.6, osd.7, osd.8, client.0] diff --git a/qa/suites/ceph-ansible/smoke/basic/1-distros/centos_7.2.yaml b/qa/suites/ceph-ansible/smoke/basic/1-distros/centos_7.2.yaml new file mode 100644 index 0000000000000..44d2f0ec81f7a --- /dev/null +++ b/qa/suites/ceph-ansible/smoke/basic/1-distros/centos_7.2.yaml @@ -0,0 +1,2 @@ +os_type: centos +os_version: "7.2" diff --git a/qa/suites/ceph-ansible/smoke/basic/1-distros/ubuntu_14.04.yaml b/qa/suites/ceph-ansible/smoke/basic/1-distros/ubuntu_14.04.yaml new file mode 100644 index 0000000000000..309e989feebd3 --- /dev/null +++ b/qa/suites/ceph-ansible/smoke/basic/1-distros/ubuntu_14.04.yaml @@ -0,0 +1,2 @@ +os_type: ubuntu +os_version: "14.04" diff --git a/qa/suites/ceph-ansible/smoke/basic/1-distros/ubuntu_16.04.yaml b/qa/suites/ceph-ansible/smoke/basic/1-distros/ubuntu_16.04.yaml new file mode 100644 index 0000000000000..a459fddffb28e --- /dev/null +++ b/qa/suites/ceph-ansible/smoke/basic/1-distros/ubuntu_16.04.yaml @@ -0,0 +1,2 @@ +os_type: ubuntu +os_version: "16.04" diff --git a/qa/suites/ceph-ansible/smoke/basic/2-config/ceph_ansible.yaml b/qa/suites/ceph-ansible/smoke/basic/2-config/ceph_ansible.yaml new file mode 100644 index 0000000000000..d5e814a090e1f --- /dev/null +++ b/qa/suites/ceph-ansible/smoke/basic/2-config/ceph_ansible.yaml @@ -0,0 +1,23 @@ +meta: +- desc: "Build the ceph cluster using ceph-ansible" + +overrides: + ceph_ansible: + vars: + ceph_conf_overrides: + global: + osd default pool size: 2 + mon pg warn min per osd: 2 + ceph_dev: true + ceph_dev_branch: jewel + ceph_dev_key: https://download.ceph.com/keys/autobuild.asc + ceph_origin: upstream + ceph_test: true + journal_collocation: true + journal_size: 1024 + osd_auto_discovery: false + +tasks: +- ssh-keys: +- ceph_ansible: +- install.ship_utilities: diff --git a/qa/suites/ceph-ansible/smoke/5-tests/ceph-admin-commands.yaml b/qa/suites/ceph-ansible/smoke/basic/3-tasks/ceph-admin-commands.yaml similarity index 100% rename from qa/suites/ceph-ansible/smoke/5-tests/ceph-admin-commands.yaml rename to qa/suites/ceph-ansible/smoke/basic/3-tasks/ceph-admin-commands.yaml diff --git a/qa/suites/ceph-ansible/smoke/basic/3-tasks/cfuse_workunit_suites_blogbench.yaml b/qa/suites/ceph-ansible/smoke/basic/3-tasks/cfuse_workunit_suites_blogbench.yaml new file mode 100644 index 0000000000000..ef3456d862496 --- /dev/null +++ b/qa/suites/ceph-ansible/smoke/basic/3-tasks/cfuse_workunit_suites_blogbench.yaml @@ -0,0 +1,8 @@ +meta: +- desc: "Run the cephfs blogbench tests" +tasks: +- ceph-fuse: +- workunit: + clients: + all: + - suites/blogbench.sh diff --git a/qa/suites/ceph-ansible/smoke/5-tests/cls.yaml b/qa/suites/ceph-ansible/smoke/basic/3-tasks/cls.yaml similarity index 100% rename from qa/suites/ceph-ansible/smoke/5-tests/cls.yaml rename to qa/suites/ceph-ansible/smoke/basic/3-tasks/cls.yaml diff --git a/qa/suites/ceph-ansible/smoke/5-tests/rbd_cli_tests.yaml.disabled b/qa/suites/ceph-ansible/smoke/basic/3-tasks/rbd_cli_tests.yaml similarity index 100% rename from qa/suites/ceph-ansible/smoke/5-tests/rbd_cli_tests.yaml.disabled rename to qa/suites/ceph-ansible/smoke/basic/3-tasks/rbd_cli_tests.yaml diff --git a/qa/suites/ceph-ansible/smoke/5-tests/rbd_import_export.yaml b/qa/suites/ceph-ansible/smoke/basic/3-tasks/rbd_import_export.yaml similarity index 100% rename from qa/suites/ceph-ansible/smoke/5-tests/rbd_import_export.yaml rename to qa/suites/ceph-ansible/smoke/basic/3-tasks/rbd_import_export.yaml -- 2.39.5