From 1143482061da50910f4f883aafdbe0a0e4269f39 Mon Sep 17 00:00:00 2001 From: Andrew Schoen Date: Fri, 5 Oct 2018 10:39:54 -0500 Subject: [PATCH] ceph-volume: fix idempotency checks for lvm batch tests The mixed type tests will change strategy after the idempotency test so we need to handle that in test playbook. Signed-off-by: Andrew Schoen --- .../tests/functional/batch/playbooks/test.yml | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/src/ceph-volume/ceph_volume/tests/functional/batch/playbooks/test.yml b/src/ceph-volume/ceph_volume/tests/functional/batch/playbooks/test.yml index 1730049f466f7..c9375e2b7fb7f 100644 --- a/src/ceph-volume/ceph_volume/tests/functional/batch/playbooks/test.yml +++ b/src/ceph-volume/ceph_volume/tests/functional/batch/playbooks/test.yml @@ -36,17 +36,28 @@ - name: ensure batch create is idempotent command: "ceph-volume --cluster {{ cluster }} lvm batch --yes --{{ osd_objectstore|default('bluestore') }} {{ '--dmcrypt' if dmcrypt|default(false) else '' }} {{ devices | join(' ') }}" + register: batch_cmd + failed_when: false environment: CEPH_VOLUME_DEBUG: 1 + - name: check batch idempotency + fail: + msg: "lvm batch failed idempotency check" + when: + - batch_cmd.rc != 0 + - "'strategy changed' not in batch_cmd.stdout" + - name: run batch --report to see if devices get filtered command: "ceph-volume --cluster {{ cluster }} lvm batch --report --format=json --{{ osd_objectstore|default('bluestore') }} {{ '--dmcrypt' if dmcrypt|default(false) else '' }} {{ devices | join(' ') }}" register: report_cmd + failed_when: false environment: CEPH_VOLUME_DEBUG: 1 - - name: verify OSDs will not be created again + - name: check batch --report idempotency fail: - msg: "Devices were not filtered out after redeploy" + msg: "lvm batch --report failed idempotency check" when: - - (report_cmd.stdout | from_json).changed + - batch_cmd.rc != 0 + - "'strategy changed' not in batch_cmd.stdout" -- 2.39.5