From d83607c3e8085c385c703bf0fe6098bf57a0fb48 Mon Sep 17 00:00:00 2001 From: Bryan Gurney Date: Mon, 6 Nov 2023 14:47:57 -0500 Subject: [PATCH] Update to version 3.6.0 --- .fmf/version | 1 + .gitignore | 1 + .stratis-cli.metadata | 1 + plans/unit.fmf | 17 +++++++++++++++++ sources | 2 +- stratis-cli.spec | 19 +++++++++++++------ tests/provision.fmf | 9 --------- tests/tests.yml | 20 -------------------- 8 files changed, 34 insertions(+), 36 deletions(-) create mode 100644 .fmf/version create mode 100644 .stratis-cli.metadata create mode 100644 plans/unit.fmf delete mode 100644 tests/provision.fmf delete mode 100644 tests/tests.yml diff --git a/.fmf/version b/.fmf/version new file mode 100644 index 0000000..d00491f --- /dev/null +++ b/.fmf/version @@ -0,0 +1 @@ +1 diff --git a/.gitignore b/.gitignore index 9bb32f7..9a5e689 100644 --- a/.gitignore +++ b/.gitignore @@ -23,3 +23,4 @@ /stratis-cli-3.4.1.tar.gz /stratis-cli-3.5.2.tar.gz /stratis-cli-3.5.3.tar.gz +/stratis-cli-3.6.0.tar.gz diff --git a/.stratis-cli.metadata b/.stratis-cli.metadata new file mode 100644 index 0000000..462ec01 --- /dev/null +++ b/.stratis-cli.metadata @@ -0,0 +1 @@ +ca2d41d023639307671e3286bd377405d08bede7 stratis-cli-3.6.0.tar.gz diff --git a/plans/unit.fmf b/plans/unit.fmf new file mode 100644 index 0000000..3a984c9 --- /dev/null +++ b/plans/unit.fmf @@ -0,0 +1,17 @@ +summary: stratis-cli unit tests + +prepare: + - name: Install package + how: install + package: [stratis-cli, util-linux, python3-psutil] + +discover: + how: shell + url: https://github.com/stratis-storage/testing.git + ref: v3.6.0 + tests: + - name: unit + test: python3 stratis_cli_cert.py -v + +execute: + how: tmt diff --git a/sources b/sources index ef95b5e..9ab4498 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (stratis-cli-3.5.3.tar.gz) = c942e87b5b790a008c79d84a16adf84fd1dd7a09bb9c4d4b4b31e0179acedce92bca74ea31b523fa2276f9c079b81e9beb9021b01d8d9b5b82ddc55ae6ba5dd9 +SHA512 (stratis-cli-3.6.0.tar.gz) = 6bdb94139eea07c130c995a687b7702b667081c7d6ff97ee1a749b1d4fe980e1b523aee182eee59a8dcf2a0664ec7fcf8b44331bc9443a2c2aa8d8bffe2d2eae diff --git a/stratis-cli.spec b/stratis-cli.spec index 959c15b..b5f3014 100644 --- a/stratis-cli.spec +++ b/stratis-cli.spec @@ -1,5 +1,5 @@ Name: stratis-cli -Version: 3.5.3 +Version: 3.6.0 Release: 1%{?dist} Summary: Command-line tool for interacting with the Stratis daemon @@ -9,6 +9,8 @@ Source0: %{url}/archive/v%{version}/%{name}-%{version}.tar.gz BuildRequires: python3-devel BuildRequires: python3-setuptools +BuildRequires: %{_bindir}/a2x +%if 0%{?rhel} BuildRequires: python3-dateutil BuildRequires: python3-dbus-client-gen BuildRequires: python3-dbus-python-client-gen @@ -16,13 +18,14 @@ BuildRequires: python3-justbytes BuildRequires: python3-packaging BuildRequires: python3-psutil BuildRequires: python3-wcwidth -BuildRequires: %{_bindir}/a2x -# It runs without, but totally useless -Requires: (stratisd >= 3.5.0 with stratisd < 4.0.0) +%endif -# stratisd only available on certain arches +# Require the version of stratisd that supports a compatible D-Bus interface +Requires: (stratisd >= 3.6.0 with stratisd < 4.0.0) + +# Exclude the same arches for stratis-cli as are excluded for stratisd ExclusiveArch: %{rust_arches} noarch -%if 0%{?rhel} && !0%{?eln} +%if 0%{?rhel} ExcludeArch: i686 %endif BuildArch: noarch @@ -72,6 +75,10 @@ a2x -f manpage docs/stratis.txt %{python3_sitelib}/stratis_cli-*.egg-info/ %changelog +* Mon Nov 06 2023 Bryan Gurney - 3.6.0-1 +- Update to version 3.6.0 +- Resolves: RHEL-2265 + * Thu Jun 08 2023 Bryan Gurney - 3.5.3-1 - Allow for inconsistent value in StoppedPools D-Bus property - Resolves: rhbz#2213325 diff --git a/tests/provision.fmf b/tests/provision.fmf deleted file mode 100644 index a192769..0000000 --- a/tests/provision.fmf +++ /dev/null @@ -1,9 +0,0 @@ ---- - -standard-inventory-qcow2: - qemu: - m: 10G - drive: - - size: 10737418240 - - size: 10737418240 - - size: 10737418240 diff --git a/tests/tests.yml b/tests/tests.yml deleted file mode 100644 index 439ebe6..0000000 --- a/tests/tests.yml +++ /dev/null @@ -1,20 +0,0 @@ ---- -- hosts: localhost - roles: - - role: standard-test-basic - tags: - - classic - tests: - - simple: - dir: ./testing/ - run: > - python stratis_cli_cert.py -v - StratisCliVersionCertify - StratisCliManPageCertify - required_packages: - - util-linux - - python3-psutil - repositories: - - repo: "https://github.com/stratis-storage/testing.git" - dest: "testing" - version: "v3.5.2"