From 85ea5b3079c7e844196c548f066d3a05adea3cb2 Mon Sep 17 00:00:00 2001
From: mulhern <amulhern@redhat.com>
Date: Fri, 22 Sep 2023 16:06:14 -0400
Subject: [PATCH] Fix up tests plan and tests for legacy pool script

Signed-off-by: mulhern <amulhern@redhat.com>
---
 plans/all.fmf           | 18 +++++++++++++++++-
 tests-fmf/loop/main.fmf |  2 +-
 tests-fmf/udev/main.fmf |  2 +-
 3 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/plans/all.fmf b/plans/all.fmf
index 607d0442b0a..7f26d3c5e70 100644
--- a/plans/all.fmf
+++ b/plans/all.fmf
@@ -3,8 +3,19 @@ prepare:
   - name: Install packages
     how: install
     package:
-     - tang
+     - cargo
+     - clang
+     - cryptsetup-devel
+     - curl
+     - dbus-devel
+     - device-mapper-devel
+     - libblkid-devel
+     - make
+     - ncurses
+     - rust
      - systemd
+     - systemd-devel
+     - tang
   - name: Start tang server
     how: shell
     script: systemctl enable tangd.socket --now
@@ -17,6 +28,11 @@ prepare:
   - name: Record mkfs.xfs version
     how: shell
     script: mkfs.xfs -V
+  - name: Build and install legacy pool script
+    how: shell
+    script:
+      - PROFILEDIR=debug make build-test-extras
+      - mv target/debug/stratis-legacy-pool /usr/local/bin
 discover:
   how: fmf
 execute:
diff --git a/tests-fmf/loop/main.fmf b/tests-fmf/loop/main.fmf
index 785361b4f6c..f6aa9887761 100644
--- a/tests-fmf/loop/main.fmf
+++ b/tests-fmf/loop/main.fmf
@@ -8,5 +8,5 @@ require:
   - python3-dbus-python-client-gen
   - python3-psutil
   - python3-pyudev
-test: TANG_URL=localhost RUST_LOG=stratisd=debug STRATISD=/usr/libexec/stratisd STRATIS_DUMPMETADATA=/usr/bin/stratis-dumpmetadata PYTHONPATH=./src make -f Makefile tang-tests dump-metadata-tests
+test: TANG_URL=localhost RUST_LOG=stratisd=debug STRATISD=/usr/libexec/stratisd STRATIS_DUMPMETADATA=/usr/bin/stratis-dumpmetadata LEGACY_POOL=/usr/local/bin/stratis-legacy-pool PYTHONPATH=./src make -f Makefile tang-tests dump-metadata-tests
 path: /tests/client-dbus
diff --git a/tests-fmf/udev/main.fmf b/tests-fmf/udev/main.fmf
index af74a1e5a0a..bf839ce4cc4 100644
--- a/tests-fmf/udev/main.fmf
+++ b/tests-fmf/udev/main.fmf
@@ -8,5 +8,5 @@ require:
   - python3-dbus-python-client-gen
   - python3-psutil
   - python3-pyudev
-test: TANG_URL=localhost RUST_LOG=stratisd=debug STRATISD=/usr/libexec/stratisd STRATIS_DUMPMETADATA=/usr/bin/stratis-dumpmetadata PYTHONPATH=./src make -f Makefile udev-tests
+test: TANG_URL=localhost RUST_LOG=stratisd=debug STRATISD=/usr/libexec/stratisd STRATIS_DUMPMETADATA=/usr/bin/stratis-dumpmetadata LEGACY_POOL=/usr/local/bin/stratis-legacy-pool PYTHONPATH=./src make -f Makefile udev-tests
 path: /tests/client-dbus