ceph-volume: fix lvm functional tests

This is related to https://github.com/ceph/ceph-ansible/pull/5413 and
adjusts the tests to work with the related ansible fix.

Fixes: https://tracker.ceph.com/issues/46131
Signed-off-by: Jan Fajerski <jfajerski@suse.com>

diff --git a/src/ceph-volume/ceph_volume/tests/functional/batch/tox.ini b/src/ceph-volume/ceph_volume/tests/functional/batch/tox.ini
index 829a928d13c33b3be1865a740085724d95305859..f7969fe9bde07dbe444e7cfaf198bb59bdd9cfb1 100644 (file)
--- a/src/ceph-volume/ceph_volume/tests/functional/batch/tox.ini
+++ b/src/ceph-volume/ceph_volume/tests/functional/batch/tox.ini
@@ -34,7 +34,7 @@ changedir=
   centos8-bluestore-mixed_type_explicit: {toxinidir}/centos8/bluestore/mixed-type-explicit
   centos8-bluestore-mixed_type_dmcrypt_explicit: {toxinidir}/centos8/bluestore/mixed-type-dmcrypt-explicit
 commands=
-  git clone -b {env:CEPH_ANSIBLE_BRANCH:master} --single-branch https://github.com/ceph/ceph-ansible.git {envdir}/tmp/ceph-ansible
+  git clone -b {env:CEPH_ANSIBLE_BRANCH:master} --single-branch {env:CEPH_ANSIBLE_CLONE:"https://github.com/ceph/ceph-ansible.git"} {envdir}/tmp/ceph-ansible
   python -m pip install -r {envdir}/tmp/ceph-ansible/tests/requirements.txt
 
   # bash {toxinidir}/../scripts/vagrant_up.sh {env:VAGRANT_UP_FLAGS:""} {posargs:--provider=virtualbox}

diff --git a/src/ceph-volume/ceph_volume/tests/functional/group_vars/bluestore_lvm b/src/ceph-volume/ceph_volume/tests/functional/group_vars/bluestore_lvm
index 65dc95233026a605e8806055763b43812695fb06..c333af3e522c1500b03ed4f343c276b92d5caaa2 100644 (file)
--- a/src/ceph-volume/ceph_volume/tests/functional/group_vars/bluestore_lvm
+++ b/src/ceph-volume/ceph_volume/tests/functional/group_vars/bluestore_lvm
@@ -11,6 +11,9 @@ osd_scenario: lvm
 ceph_origin: 'repository'
 ceph_repository: 'dev'
 copy_admin_key: false
+pv_devices:
+  - /dev/vdb
+  - /dev/vdc
 lvm_volumes:
   - data: data-lv1
     data_vg: test_group

diff --git a/src/ceph-volume/ceph_volume/tests/functional/group_vars/bluestore_lvm_dmcrypt b/src/ceph-volume/ceph_volume/tests/functional/group_vars/bluestore_lvm_dmcrypt
index 93c870a36db00856d8d92015aaa8ec96cb06c5d8..d73637763bc5b6e105c3a0020ad2b5c2962d33f4 100644 (file)
--- a/src/ceph-volume/ceph_volume/tests/functional/group_vars/bluestore_lvm_dmcrypt
+++ b/src/ceph-volume/ceph_volume/tests/functional/group_vars/bluestore_lvm_dmcrypt
@@ -12,6 +12,9 @@ osd_scenario: lvm
 ceph_origin: 'repository'
 ceph_repository: 'dev'
 copy_admin_key: false
+pv_devices:
+  - /dev/vdb
+  - /dev/vdc
 lvm_volumes:
   - data: data-lv1
     data_vg: test_group

diff --git a/src/ceph-volume/ceph_volume/tests/functional/group_vars/filestore_lvm b/src/ceph-volume/ceph_volume/tests/functional/group_vars/filestore_lvm
index cc40419d6e6905576f4c55d54bdb0ef699d5fba3..f5f26e7cef885a370c32e7f645c46ca65035f158 100644 (file)
--- a/src/ceph-volume/ceph_volume/tests/functional/group_vars/filestore_lvm
+++ b/src/ceph-volume/ceph_volume/tests/functional/group_vars/filestore_lvm
@@ -11,6 +11,9 @@ osd_scenario: lvm
 ceph_origin: 'repository'
 ceph_repository: 'dev'
 copy_admin_key: false
+pv_devices:
+  - /dev/vdb
+  - /dev/vdc
 # test-volume is created by tests/functional/lvm_setup.yml from /dev/sda
 lvm_volumes:
   - data: data-lv1

diff --git a/src/ceph-volume/ceph_volume/tests/functional/group_vars/filestore_lvm_dmcrypt b/src/ceph-volume/ceph_volume/tests/functional/group_vars/filestore_lvm_dmcrypt
index d0910837275f00209496ceb0d3f8858c158f6b2c..e5c08727108e6add13ae375ff668ba23ffd4bce2 100644 (file)
--- a/src/ceph-volume/ceph_volume/tests/functional/group_vars/filestore_lvm_dmcrypt
+++ b/src/ceph-volume/ceph_volume/tests/functional/group_vars/filestore_lvm_dmcrypt
@@ -12,6 +12,9 @@ osd_scenario: lvm
 ceph_origin: 'repository'
 ceph_repository: 'dev'
 copy_admin_key: false
+pv_devices:
+  - /dev/vdb
+  - /dev/vdc
 # test-volume is created by tests/functional/lvm_setup.yml from /dev/sda
 lvm_volumes:
   - data: data-lv1

diff --git a/src/ceph-volume/ceph_volume/tests/functional/lvm/playbooks/test_bluestore.yml b/src/ceph-volume/ceph_volume/tests/functional/lvm/playbooks/test_bluestore.yml
index e8cf077c6cb82faaa4c7bad500769c33d12f1538..2cf83e477fbd6d0533a61252e4e193b27f2c2419 100644 (file)
--- a/src/ceph-volume/ceph_volume/tests/functional/lvm/playbooks/test_bluestore.yml
+++ b/src/ceph-volume/ceph_volume/tests/functional/lvm/playbooks/test_bluestore.yml
@@ -114,8 +114,8 @@
         suffix: sparse
       register: tmpdir
 
-    - name: create a 5GB sparse file
-      command: fallocate -l 5G {{ tmpdir.path }}/sparse.file
+    - name: create a 1GB sparse file
+      command: fallocate -l 1G {{ tmpdir.path }}/sparse.file
 
     - name: find an empty loop device
       command: losetup -f

diff --git a/src/ceph-volume/ceph_volume/tests/functional/lvm/playbooks/test_filestore.yml b/src/ceph-volume/ceph_volume/tests/functional/lvm/playbooks/test_filestore.yml
index 9239a36246534230b9067bb47cce4d497bdacff4..42ee40a1baa65f49e95f9e47df8f2cb4f0ddb84c 100644 (file)
--- a/src/ceph-volume/ceph_volume/tests/functional/lvm/playbooks/test_filestore.yml
+++ b/src/ceph-volume/ceph_volume/tests/functional/lvm/playbooks/test_filestore.yml
@@ -135,8 +135,8 @@
         suffix: sparse
       register: tmpdir
 
-    - name: create a 5GB sparse file
-      command: fallocate -l 5G {{ tmpdir.path }}/sparse.file
+    - name: create a 1GB sparse file
+      command: fallocate -l 1G {{ tmpdir.path }}/sparse.file
 
     - name: find an empty loop device
       command: losetup -f

diff --git a/src/ceph-volume/ceph_volume/tests/functional/lvm/tox.ini b/src/ceph-volume/ceph_volume/tests/functional/lvm/tox.ini
index 1dd7c999f0baa8eb5f1397fb7994e9106893ca8d..2b63875bf438d0969dd3c90015a065db617dbcb2 100644 (file)
--- a/src/ceph-volume/ceph_volume/tests/functional/lvm/tox.ini
+++ b/src/ceph-volume/ceph_volume/tests/functional/lvm/tox.ini
@@ -32,7 +32,7 @@ changedir=
   centos8-filestore-prepare_activate: {toxinidir}/xenial/filestore/prepare_activate
   centos8-bluestore-prepare_activate: {toxinidir}/xenial/bluestore/prepare_activate
 commands=
-  git clone -b {env:CEPH_ANSIBLE_BRANCH:master} --single-branch https://github.com/ceph/ceph-ansible.git {envdir}/tmp/ceph-ansible
+  git clone -b {env:CEPH_ANSIBLE_BRANCH:master} --single-branch {env:CEPH_ANSIBLE_CLONE:"https://github.com/ceph/ceph-ansible.git"} {envdir}/tmp/ceph-ansible
   pip install -r {envdir}/tmp/ceph-ansible/tests/requirements.txt
 
   bash {toxinidir}/../scripts/vagrant_up.sh {env:VAGRANT_UP_FLAGS:"--no-provision"} {posargs:--provider=virtualbox}