From 3c2840da03ac7bd131f60c9550e6e890b2abeffd Mon Sep 17 00:00:00 2001 From: Dimitri Savineau Date: Wed, 28 Aug 2019 10:49:54 -0400 Subject: [PATCH] tests: update container tag for ooo_collocation It doesn't make sense to test the old 3.0.x container images with nautilus+ ceph releases. Also disable the dashboard deployment and switch to bluestore backend. Signed-off-by: Dimitri Savineau --- tests/functional/ooo-collocation/hosts | 7 +------ tox.ini | 4 ++-- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/tests/functional/ooo-collocation/hosts b/tests/functional/ooo-collocation/hosts index 12f1e35d1..bd3b68f28 100644 --- a/tests/functional/ooo-collocation/hosts +++ b/tests/functional/ooo-collocation/hosts @@ -11,10 +11,6 @@ all: ceph_docker_image: ceph/daemon ceph_docker_image_tag: latest-master ceph_docker_registry: docker.io - ceph_origin: repository - ceph_repository: community - ceph_release: luminous - ceph_stable: true cephfs_data_pool: name: 'manila_data' pg_num: "{{ osd_pool_default_pg_num }}" @@ -48,7 +44,6 @@ all: generate_fsid: false ip_version: ipv4 ireallymeanit: 'yes' - journal_size: 512 keys: - {key: AQAN0RdbAAAAABAA3CpSKRVDrENjkOSunEFZ0A==, mgr_cap: 'allow *', mode: '0600', mon_cap: 'allow r', name: client.openstack, osd_cap: "allow class-read object_prefix rbd_children, allow rwx pool=volumes, allow rwx pool=backups, allow rwx pool=vms, allow rwx pool=images, allow rwx pool=metrics"} - {key: AQAN0RdbAAAAABAAtV5Dq28z4H6XxwhaNEaFZg==, mds_cap: 'allow *', mgr_cap: 'allow *', mode: '0600', mon_cap: 'allow r, allow command \"auth del\", allow command \"auth caps\", allow command \"auth get\", allow command \"auth get-or-create\"', name: client.manila, osd_cap: 'allow rw'} @@ -67,7 +62,6 @@ all: - {name: backups, pg_num: 8, rule_name: ''} - {name: vms, pg_num: 8, rule_name: ''} - {name: volumes, pg_num: 8, rule_name: ''} - osd_objectstore: filestore ceph_osd_docker_run_script_path: /opt pools: [] public_network: 192.168.95.0/24 @@ -75,6 +69,7 @@ all: radosgw_civetweb_port: '8080' radosgw_keystone_ssl: false user_config: true + dashboard_enabled: false clients: hosts: client0: {} diff --git a/tox.ini b/tox.ini index c4e67f68c..43ff9ef9f 100644 --- a/tox.ini +++ b/tox.ini @@ -405,7 +405,7 @@ setenv= switch_to_containers: CEPH_STABLE_RELEASE = octopus switch_to_containers: CEPH_DOCKER_IMAGE_TAG = latest-master-devel - ooo_collocation: CEPH_DOCKER_IMAGE_TAG = v3.0.3-stable-3.0-luminous-centos-7-x86_64 + ooo_collocation: CEPH_DOCKER_IMAGE_TAG = latest-master deps= -r{toxinidir}/tests/requirements.txt changedir= all_daemons: {toxinidir}/tests/functional/all_daemons{env:CONTAINER_DIR:} @@ -442,7 +442,7 @@ commands= bash {toxinidir}/tests/scripts/generate_ssh_config.sh {changedir} # configure lvm - !lvm_batch-!lvm_auto_discovery: ansible-playbook -vv -i {changedir}/{env:INVENTORY} {toxinidir}/tests/functional/lvm_setup.yml + !lvm_batch-!lvm_auto_discovery-!ooo_collocation: ansible-playbook -vv -i {changedir}/{env:INVENTORY} {toxinidir}/tests/functional/lvm_setup.yml rhcs: ansible-playbook -vv -i {changedir}/{env:INVENTORY} {toxinidir}/tests/functional/rhcs_setup.yml --extra-vars "ceph_docker_registry={env:CEPH_DOCKER_REGISTRY:docker.io} repo_url={env:REPO_URL:} rhel7_repo_url={env:RHEL7_REPO_URL:}" --skip-tags "vagrant_setup" -- 2.39.5