diff --git a/.gitignore b/.gitignore index 229737a..683388d 100644 --- a/.gitignore +++ b/.gitignore @@ -6,166 +6,3 @@ /nmstate-0.0.4.tar.gz /nmstate-0.0.5.tar.gz /nmstate-0.0.5.tar.gz.asc -/nmstate-0.0.6.tar.gz.asc -/nmstate-0.0.6.tar.gz -/nmstate-0.0.7.tar.gz -/nmstate-0.0.7.tar.gz.asc -/nmstate-0.0.8.tar.gz.asc -/nmstate-0.0.8.tar.gz -/nmstate-0.1.1.tar.gz -/nmstate-0.1.1.tar.gz.asc -/nmstate-0.2.0.tar.gz -/nmstate-0.2.0.tar.gz.asc -/nmstate-0.2.1.tar.gz -/nmstate-0.2.1.tar.gz.asc -/nmstate-0.2.2.tar.gz -/nmstate-0.2.2.tar.gz.asc -/nmstate-0.2.3.tar.gz -/nmstate-0.2.3.tar.gz.asc -/nmstate-0.2.4.tar.gz -/nmstate-0.2.4.tar.gz.asc -/nmstate-0.2.5.tar.gz -/nmstate-0.2.5.tar.gz.asc -/nmstate-0.2.6.tar.gz -/nmstate-0.2.6.tar.gz.asc -/nmstate-0.2.7.tar.gz -/nmstate-0.2.7.tar.gz.asc -/nmstate-0.2.8.tar.gz -/nmstate-0.2.8.tar.gz.asc -/nmstate-0.2.9.tar.gz -/nmstate-0.2.9.tar.gz.asc -/nmstate-0.2.10.tar.gz -/nmstate-0.2.10.tar.gz.asc -/nmstate-0.3.0.tar.gz -/nmstate-0.3.0.tar.gz.asc -/nmstate.gpg -/nmstate-0.3.1.tar.gz -/nmstate-0.3.1.tar.gz.asc -/nmstate-0.3.2.tar.gz -/nmstate-0.3.2.tar.gz.asc -/nmstate-0.3.3.tar.gz -/nmstate-0.3.3.tar.gz.asc -/nmstate-0.3.4.tar.gz -/nmstate-0.3.4.tar.gz.asc -/nmstate-0.3.5.tar.gz -/nmstate-0.3.5.tar.gz.asc -/nmstate-0.4.0.tar.gz -/nmstate-0.4.0.tar.gz.asc -/nmstate-0.4.1.tar.gz -/nmstate-0.4.1.tar.gz.asc -/nmstate-1.0.0.tar.gz -/nmstate-1.0.0.tar.gz.asc -/nmstate-1.0.1.tar.gz -/nmstate-1.0.1.tar.gz.asc -/nmstate-1.0.2.tar.gz.asc -/nmstate-1.0.2.tar.gz -/nmstate-1.0.3.tar.gz -/nmstate-1.0.3.tar.gz.asc -/nmstate-1.1.0.tar.gz -/nmstate-1.1.0.tar.gz.asc -/nmstate-1.2.0.tar.gz.asc -/nmstate-1.2.0.tar.gz -/nmstate-2.0.0.tar.gz -/nmstate-2.0.0.tar.gz.asc -/nmstate-2.1.0-alpha1.tar.gz -/nmstate-2.1.0-alpha1.tar.gz.asc -/nmstate-2.1.0-alpha2.tar.gz -/nmstate-2.1.0-alpha2.tar.gz.asc -/nmstate-2.1.0.tar.gz -/nmstate-2.1.0.tar.gz.asc -/nmstate-2.1.2.tar.gz -/nmstate-2.1.2.tar.gz.asc -/nmstate-2.1.4.tar.gz -/nmstate-2.1.4.tar.gz.asc -/nmstate-2.2.0.tar.gz -/nmstate-2.2.0.tar.gz.asc -/nmstate-2.2.2.tar.gz -/nmstate-2.2.2.tar.gz.asc -/nmstate-2.2.3.tar.gz.asc -/nmstate-2.2.3.tar.gz -/nmstate-2.2.4.tar.gz -/nmstate-2.2.4.tar.gz.asc -/nmstate-2.2.5.tar.gz -/nmstate-2.2.5.tar.gz.asc -/nmstate-2.2.8.tar.gz -/nmstate-2.2.8.tar.gz.asc -/nmstate-2.2.9.tar.gz -/nmstate-2.2.9.tar.gz.asc -/nmstate-2.2.10.tar.gz -/nmstate-2.2.10.tar.gz.asc -/nmstate-vendor-2.2.10.tar.xz -/nmstate-2.2.12.tar.gz -/nmstate-2.2.12.tar.gz.asc -/nmstate-vendor-2.2.12.tar.xz -/nmstate-2.2.13.tar.gz -/nmstate-2.2.13.tar.gz.asc -/nmstate-vendor-2.2.13.tar.xz -/nmstate-2.2.14.tar.gz -/nmstate-2.2.14.tar.gz.asc -/nmstate-vendor-2.2.14.tar.xz -/nmstate-2.2.15.tar.gz -/nmstate-2.2.15.tar.gz.asc -/nmstate-vendor-2.2.15.tar.xz -/nmstate-2.2.21.tar.gz -/nmstate-2.2.21.tar.gz.asc -/nmstate-vendor-2.2.21.tar.xz -/nmstate-2.2.26.tar.gz -/nmstate-2.2.26.tar.gz.asc -/nmstate-vendor-2.2.26.tar.xz -/nmstate-2.2.33.tar.gz -/nmstate-2.2.33.tar.gz.asc -/nmstate-vendor-2.2.33.tar.xz -/nmstate-2.2.34.tar.gz -/nmstate-2.2.34.tar.gz.asc -/nmstate-vendor-2.2.34.tar.xz -/nmstate-2.2.35.tar.gz -/nmstate-2.2.35.tar.gz.asc -/nmstate-vendor-2.2.35.tar.xz -/nmstate-2.2.39.tar.gz -/nmstate-2.2.39.tar.gz.asc -/nmstate-vendor-2.2.39.tar.xz -/nmstate-2.2.40.tar.gz -/nmstate-2.2.40.tar.gz.asc -/nmstate-vendor-2.2.40.tar.xz -/nmstate-2.2.41.tar.gz -/nmstate-2.2.41.tar.gz.asc -/nmstate-vendor-2.2.41.tar.xz -/nmstate-2.2.42.tar.gz -/nmstate-2.2.42.tar.gz.asc -/nmstate-vendor-2.2.42.tar.xz -/nmstate-2.2.43.tar.gz -/nmstate-2.2.43.tar.gz.asc -/nmstate-vendor-2.2.43.tar.xz -/nmstate-2.2.44.tar.gz -/nmstate-2.2.44.tar.gz.asc -/nmstate-vendor-2.2.44.tar.xz -/nmstate-2.2.45.tar.gz -/nmstate-2.2.45.tar.gz.asc -/nmstate-vendor-2.2.45.tar.xz -/nmstate-2.2.46.tar.gz -/nmstate-2.2.46.tar.gz.asc -/nmstate-vendor-2.2.46.tar.xz -/nmstate-2.2.47.tar.gz -/nmstate-2.2.47.tar.gz.asc -/nmstate-vendor-2.2.47.tar.xz -/nmstate-2.2.48.tar.gz -/nmstate-2.2.48.tar.gz.asc -/nmstate-vendor-2.2.48.tar.xz -/nmstate-2.2.49.tar.gz -/nmstate-2.2.49.tar.gz.asc -/nmstate-vendor-2.2.49.tar.xz -/nmstate-2.2.50.tar.gz -/nmstate-2.2.50.tar.gz.asc -/nmstate-vendor-2.2.50.tar.xz -/nmstate-2.2.52.tar.gz -/nmstate-2.2.52.tar.gz.asc -/nmstate-vendor-2.2.52.tar.xz -/nmstate-2.2.54.tar.gz -/nmstate-2.2.54.tar.gz.asc -/nmstate-vendor-2.2.54.tar.xz -/nmstate-2.2.55.tar.gz -/nmstate-2.2.55.tar.gz.asc -/nmstate-vendor-2.2.55.tar.xz -/nmstate-2.2.57.tar.gz -/nmstate-2.2.57.tar.gz.asc -/nmstate-vendor-2.2.57.tar.xz diff --git a/.packit.yaml b/.packit.yaml deleted file mode 100644 index cd4cca0..0000000 --- a/.packit.yaml +++ /dev/null @@ -1,29 +0,0 @@ ---- -downstream_package_name: nmstate -upstream_project_url: https://github.com/nmstate/nmstate -issue_repository: https://github.com/nmstate/nmstate -update_release: false -upstream_package_name: nmstate -upstream_tag_template: v{version} -copy_upstream_release_description: true - -jobs: - # This is triggered by https://release-monitoring.org/ - - job: pull_from_upstream - trigger: release - dist_git_branches: - - fedora-all - - # This is triggered at Fedora dist-git for creating koji build after - # PR in src.fedoraproject.org been merged. - - job: koji_build - trigger: commit - allowed_pr_authors: ["packit-stg", "packit"] - dist_git_branches: - - fedora-all - - # This is triggered at Fedora messaging bus about koji build finished. - - job: bodhi_update - trigger: commit - dist_git_branches: - - fedora-branched diff --git a/README.md b/README.md index 2642134..d1ae56e 100644 --- a/README.md +++ b/README.md @@ -1,10 +1,3 @@ # nmstate -The nmstate package - -## Bundle update with rust-netlink and nispor - -When certain nmstate update requires new release of rust-netlink or nispor, -please check this document on correct procedure: - -https://docs.fedoraproject.org/en-US/package-maintainers/Package_Update_Guide/#multiple_packages +The nmstate package \ No newline at end of file diff --git a/README.packit b/README.packit deleted file mode 100644 index e03362b..0000000 --- a/README.packit +++ /dev/null @@ -1,3 +0,0 @@ -This repository is maintained by packit. -https://packit.dev/ -The file was generated using packit 1.12.0.post1.dev13+gd51655c23. diff --git a/nmstate.spec b/nmstate.spec index 172d11c..0ad391b 100644 --- a/nmstate.spec +++ b/nmstate.spec @@ -1,273 +1,96 @@ +%?python_enable_dependency_generator %define srcname nmstate %define libname libnmstate Name: nmstate -Version: 2.2.57 -Release: %autorelease +Version: 0.0.5 +Release: 1%{?dist} Summary: Declarative network manager API -License: Apache-2.0 AND LGPL-2.1-or-later +License: GPLv2+ URL: https://github.com/%{srcname}/%{srcname} -Source0: %{url}/releases/download/v%{version}/%{srcname}-%{version}.tar.gz -Source1: %{url}/releases/download/v%{version}/%{srcname}-%{version}.tar.gz.asc -Source2: https://nmstate.io/nmstate.gpg -Source3: %{url}/releases/download/v%{version}/%{srcname}-vendor-%{version}.tar.xz -# Force nmstate-libs upgrade along with nmstate rpm when installed -# https://issues.redhat.com/browse/RHEL-52890 -Requires: (nmstate-libs%{?_isa} = %{version}-%{release} if nmstate-libs) +Source0: %{url}/archive/v%{version}/%{srcname}-%{version}.tar.gz +Source1: %{url}/archive/v%{version}/%{srcname}-%{version}.tar.gz.asc +Source2: gpgkey-F7910D93CA83D77348595C0E899014C0463C12BB.gpg +BuildArch: noarch BuildRequires: python3-devel +BuildRequires: python3-setuptools BuildRequires: gnupg2 -BuildRequires: systemd-devel -BuildRequires: systemd-rpm-macros -%if 0%{?rhel} -BuildRequires: rust-toolset -%else -BuildRequires: rust-packaging -BuildRequires: (crate(clap/cargo) >= 3.1 with crate(clap/cargo) < 4.0) -BuildRequires: (crate(clap/default) >= 3.1 with crate(clap/default) < 4.0) -BuildRequires: (crate(time/std) >= 0.3 with crate(time/std) < 0.4) -BuildRequires: (crate(time/formatting) >= 0.3 with crate(time/formatting) < 0.4) -BuildRequires: (crate(time/parsing) >= 0.3 with crate(time/parsing) < 0.4) -BuildRequires: (crate(env_logger/default) >= 0.11 with crate(env_logger/default) < 0.12) -BuildRequires: (crate(libc/default) >= 0.2 with crate(libc/default) < 0.3) -BuildRequires: (crate(log/default) >= 0.4 with crate(log/default) < 0.5) -BuildRequires: (crate(nispor/default) >= 1.2.27 with crate(nispor/default) < 2.0) -BuildRequires: (crate(serde/default) >= 1.0 with crate(serde/default) < 2.0) -BuildRequires: (crate(serde/derive) >= 1.0 with crate(serde/derive) < 2.0) -BuildRequires: (crate(serde_json/default) >= 1.0 with crate(serde_json/default) < 2.0) -BuildRequires: (crate(serde_yaml/default) >= 0.9 with crate(serde_yaml/default) < 1.0) -BuildRequires: (crate(uuid/v4) >= 1.1 with crate(uuid/v4) < 2.0) -BuildRequires: (crate(uuid/v5) >= 1.1 with crate(uuid/v5) < 2.0) -BuildRequires: (crate(zbus/default) >= 5.1 with crate(zbus/default) < 6.0) -BuildRequires: (crate(zvariant/default) >= 5.1 with crate(zvariant/default) < 6.0) -BuildRequires: (crate(nix/default) >= 0.30 with crate(nix/default) < 0.31) -BuildRequires: (crate(toml/default) >= 0.9 with crate(toml/default) < 1.0) -BuildRequires: (crate(tokio/default) >= 1.3 with crate(tokio/default) < 2.0) -BuildRequires: (crate(tokio/net) >= 1.3 with crate(tokio/net) < 2.0) -BuildRequires: (crate(tokio/rt) >= 1.3 with crate(tokio/rt) < 2.0) -BuildRequires: (crate(tokio/signal) >= 1.3 with crate(tokio/signal) < 2.0) -BuildRequires: (crate(tokio/time) >= 1.3 with crate(tokio/time) < 2.0) -BuildRequires: (crate(once_cell/default) >= 1.12 with crate(once_cell/default) < 2.0) -%endif - -%generate_buildrequires -pushd rust/src/python >/dev/null -%pyproject_buildrequires -popd >/dev/null +Requires: python3-setuptools +Requires: python3-%{libname} = %{?epoch:%{epoch}:}%{version}-%{release} %description -Nmstate is a library with an accompanying command line tool that manages host +NMState is a library with an accompanying command line tool that manages host networking settings in a declarative manner and aimed to satisfy enterprise needs to manage host networking through a northbound declarative API and multi provider support on the southbound. -%package libs -Summary: C binding of nmstate -# Use Recommends for NetworkManager because only access to NM DBus is required, -# but NM could be running on a different host -Recommends: NetworkManager -# Avoid automatically generated profiles -Recommends: NetworkManager-config-server -License: Apache-2.0 - -%description libs -C binding of nmstate. - -%package devel -Summary: Development files for nmstate -Group: Development/Libraries -Requires: %{name}-libs%{?_isa} = %{version}-%{release} -License: Apache-2.0 - -%description devel -Development files of nmstate C binding. - -%package static -Summary: Static development files for nmstate -Group: Development/Libraries -License: Apache-2.0 -Requires: %{name}-devel%{?_isa} = %{version}-%{release} - -%description static -Static C library bindings for nmstate. - %package -n python3-%{libname} Summary: nmstate Python 3 API library +Requires: NetworkManager-libnm +# Once upstream fixed requirements.txt, remove the explicit dependency on +# python3-gobject-base and let let python_enable_dependency_generator macro +# generate it. +# Bug report: https://github.com/nmstate/nmstate/issues/184 +Requires: python3-gobject-base # Use Recommends for NetworkManager because only access to NM DBus is required, # but NM could be running on a different host Recommends: NetworkManager -# Avoid automatically generated profiles -Recommends: NetworkManager-config-server -Recommends: (nmstate-plugin-ovsdb if openvswitch) -# Use Suggests for NetworkManager-ovs and NetworkManager-team since it is only -# required for OVS and team support +# Use Suggests for NetworkManager-ovs since it is only required for OVS support Suggests: NetworkManager-ovs -Suggests: NetworkManager-team -Provides: nmstate-plugin-ovsdb = %{version}-%{release} -Requires: %{name}-libs%{?_isa} = %{version}-%{release} -Obsoletes: nmstate-plugin-ovsdb < 2.0-1 -License: Apache-2.0 + %description -n python3-%{libname} -This package contains the Python 3 library for Nmstate. - -%if ! 0%{?rhel} -%package -n rust-%{name}-devel -Summary: Rust crate of nmstate -BuildArch: noarch -License: Apache-2.0 - -%description -n rust-%{name}-devel -This package contains library source intended for building other packages -which use "%{name}" crate. - -%package -n rust-%{name}+default-devel -Summary: Rust crate of nmstate with default feature -BuildArch: noarch -License: Apache-2.0 - -%description -n rust-%{name}+default-devel -This package contains library source intended for building other packages -which use "%{name}" crate with default feature. - -%package -n rust-%{name}+gen_conf-devel -Summary: Rust crate of nmstate with default feature -BuildArch: noarch -License: Apache-2.0 - -%description -n rust-%{name}+gen_conf-devel -This package contains library source intended for building other packages -which use "%{name}" crate with gen_conf feature. - -%package -n rust-%{name}+query_apply-devel -Summary: Rust crate of nmstate with query_apply feature -BuildArch: noarch -License: Apache-2.0 -# https://bugzilla.redhat.com/show_bug.cgi?id=2161128 -Requires: (crate(nispor/default) >= 1.2.17 with crate(nispor/default) < 2.0) -Requires: (crate(nix/default) >= 0.26 with crate(nix/default) < 0.27) -Requires: (crate(zbus/default) >= 5.1 with crate(zbus/default) < 6.0) - -%description -n rust-%{name}+query_apply-devel -This package contains library source intended for building other packages -which use "%{name}" crate with query_apply feature. - -%package -n rust-%{name}+gen_revert-devel -Summary: Rust crate of nmstate with gen_revert feature -BuildArch: noarch -License: Apache-2.0 - -%description -n rust-%{name}+gen_revert-devel -This package contains library source intended for building other packages -which use "%{name}" crate with gen_revert feature. -%endif +This package contains the Python 3 library for nmstate. %prep -gpg2 --import --import-options import-export,import-minimal \ - %{SOURCE2} > ./gpgkey-mantainers.gpg -gpgv2 --keyring ./gpgkey-mantainers.gpg %{SOURCE1} %{SOURCE0} - -%autosetup -n %{name}-%{version_no_tilde} -p1 %{?rhel:-a3} - -pushd rust -%if 0%{?rhel} -mv ../vendor ./ -%cargo_prep -v vendor -%else -%cargo_prep -%endif -popd +gpgv2 --keyring %{SOURCE2} %{SOURCE1} %{SOURCE0} +%setup -q %build -pushd rust -%cargo_build -%cargo_license_summary -%{cargo_license} > ../LICENSE.dependencies -%if 0%{?rhel} -%cargo_vendor_manifest -%endif -popd - -pushd rust/src/python -%pyproject_wheel -popd +%py3_build %install -env SKIP_PYTHON_INSTALL=1 \ - PREFIX=%{_prefix} \ - LIBDIR=%{_libdir} \ - SYSCONFDIR=%{_sysconfdir} \ - %make_install - -pushd rust/src/python -%pyproject_install -popd - -%if ! 0%{?rhel} -pushd rust/src/lib -# Fedora cargo2rpm has problem when working with worksace dependency -# https://pagure.io/fedora-rust/cargo2rpm/issue/13 -# we use `cargo package` to generate the expanded Cargo.toml which -# is also the one used in crates.io -cargo package --frozen --no-verify --target-dir %{_tmppath} -tar xf %{_tmppath}/package/nmstate-%{version}.crate \ - nmstate-%{version}/Cargo.toml -mv nmstate-%{version}/Cargo.toml ./Cargo.toml -# Remove worksapce Cargo.toml -rm ../../Cargo.toml -%cargo_install -popd -%endif +%py3_install %files %doc README.md -%license LICENSE.dependencies -%if 0%{?rhel} -%license rust/cargo-vendor.txt -%endif %doc examples/ -%{_mandir}/man8/nmstatectl.8* -%{_mandir}/man8/nmstate-autoconf.8* -%{_mandir}/man8/nmstate.service.8* +%{python3_sitelib}/nmstatectl %{_bindir}/nmstatectl -%{_bindir}/nmstate-autoconf -%{_unitdir}/nmstate.service -%dir %{_sysconfdir}/%{name} -%{_sysconfdir}/%{name}/README - -%files libs -%{_libdir}/libnmstate.so.* - -%files devel -%{_libdir}/libnmstate.so -%{_includedir}/nmstate.h -%{_libdir}/pkgconfig/nmstate.pc %files -n python3-%{libname} %license LICENSE %{python3_sitelib}/%{libname} -%{python3_sitelib}/%{srcname}-*.dist-info/ - -%files static -%{_libdir}/libnmstate.a - -%if ! 0%{?rhel} -%files -n rust-%{name}-devel -%license LICENSE -%{cargo_registry}/%{name}-%{version}/ - -%files -n rust-%{name}+default-devel -%ghost %{cargo_registry}/%{name}-%{version}/Cargo.toml - -%files -n rust-%{name}+gen_conf-devel -%ghost %{cargo_registry}/%{name}-%{version}/Cargo.toml - -%files -n rust-%{name}+query_apply-devel -%ghost %{cargo_registry}/%{name}-%{version}/Cargo.toml - -%files -n rust-%{name}+gen_revert-devel -%ghost %{cargo_registry}/%{name}-%{version}/Cargo.toml -%endif +%{python3_sitelib}/%{srcname}-*.egg-info/ %changelog -%autochangelog +* Tue Mar 12 2019 Gris Ge - 0.0.5-1 +- Upgrade to 0.0.5 + +* Fri Feb 01 2019 Fedora Release Engineering - 0.0.4-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Tue Jan 29 2019 Till Maas - 0.0.4-2 +- Sync with upstream spec +- Use Recommends for NetworkManager +- Add Suggests for NetworkManager-ovs +- package examples as doc + +* Thu Jan 24 2019 Gris Ge - 0.0.4-1 +- Upgrade to 0.0.4. + +* Mon Jan 21 2019 Gris Ge - 0.0.3-3 +- Add missing runtime dependency for nmstatectl. + +* Wed Jan 02 2019 Gris Ge - 0.0.3-2 +- Add source file PGP verification. + +* Thu Dec 20 2018 Gris Ge - 0.0.3-1 +- Upgrade to 0.0.3. + +* Mon Dec 03 2018 Gris Ge - 0.0.2-2 +- Trival RPM SPEC fix. + +* Wed Nov 28 2018 Gris Ge - 0.0.2-1 +- Initial release. diff --git a/sources b/sources index 93fcb0a..4df2b07 100644 --- a/sources +++ b/sources @@ -1,4 +1,3 @@ -SHA512 (nmstate-2.2.57.tar.gz) = b203455ce70e8c2f0e0d67d0b57ded8da1a8a6492bc636412b4682d15453cdb694cf33b1c84498ab50e3a42a79d3a763ef3316943b356ccab5f858df03fd0a63 -SHA512 (nmstate-2.2.57.tar.gz.asc) = 972de00f4b4e18410c5aa6a6d23606ceda496c18747f7ba95e6602f21f24f8b3eaffe1d3e82aaf3e529592989f12ce1198b40c8b83abb6b7d108666b56ec7359 -SHA512 (nmstate.gpg) = e465239bc2a037457c5cb105f69cb033c092708285689f906b5e40cae01e12629bec1cdee7eb6aa3a327e4fc93dfd5ce0e006b295fe5ced8df039f9098cef0bc -SHA512 (nmstate-vendor-2.2.57.tar.xz) = 88c69f1f20367acd858b25bb0e834ae7b21b4291d90b0ed62dd33c9a427f845b98fa56ba6b8d4228bc6c807f2293d77f4cd6ed7a568e6ceff19c875ef3bea6dd +SHA512 (nmstate-0.0.5.tar.gz) = 68c9fe419574b42bf06648bca3013eedbbca1af575d597e50bb1e246217b878d7738415167e4b18f354d5c620bec69b5892bbe81549abd3cfbe9ea9d02a3b930 +SHA512 (nmstate-0.0.5.tar.gz.asc) = f1d0c67c2bb00ccc84294f17d5b4af4ee5c0b51c2b2f137bdc8ab6131ae5b16e9785d324e907d6f5f86f87f912a6d2214f57ebe92757f140fa4ae291974acef2 +SHA512 (gpgkey-F7910D93CA83D77348595C0E899014C0463C12BB.gpg) = 0b416e3c465ff679f701cb1f4d264d8341f1c778ca1403a39b83df959cad5c4faf23f6cbb1772b2547cbbdb267cb9d1a34794cc1710950f0d847b5f5c67361bf diff --git a/tests/cli_query_reapply/Makefile b/tests/cli_query_reapply/Makefile new file mode 100644 index 0000000..76b0767 --- /dev/null +++ b/tests/cli_query_reapply/Makefile @@ -0,0 +1,2 @@ +run: + ./runtest.sh diff --git a/tests/cli_query_reapply.sh b/tests/cli_query_reapply/runtest.sh similarity index 66% rename from tests/cli_query_reapply.sh rename to tests/cli_query_reapply/runtest.sh index 492857d..71dd38e 100755 --- a/tests/cli_query_reapply.sh +++ b/tests/cli_query_reapply/runtest.sh @@ -4,6 +4,4 @@ TMP_FILE=$(mktemp /tmp/nmstate.XXXXXX.yaml) nmstatectl show > $TMP_FILE -cat $TMP_FILE - -nmstatectl set $TMP_FILE 2>&1 +nmstatectl set $TMP_FILE diff --git a/tests/tests.yml b/tests/tests.yml index ce55f12..5f1fffc 100644 --- a/tests/tests.yml +++ b/tests/tests.yml @@ -1,12 +1,9 @@ - hosts: localhost roles: - - role: standard-test-basic + - role: standard-test-beakerlib tags: - classic - remote_user: root tests: - - cli_query_reapply: - dir: . - run: ./cli_query_reapply.sh + - cli_query_reapply required_packages: - nmstate