Fix up tests plan and tests for legacy pool script

Signed-off-by: mulhern <[email protected]>
stratis-storage · Sep 22, 2023 · 996adf6 · 996adf6
1 parent 56ca9bd
commit 996adf6
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 3 deletions.
diff --git a/plans/all.fmf b/plans/all.fmf
@@ -3,14 +3,30 @@ 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
   - name: Reload udev
     how: shell
     script: udevadm control --reload
+  - 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/test/loop/main.fmf b/test/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/test/udev/main.fmf b/test/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