Merge branch 'master' into f24

.gitignore

@@ -1,28 +1,6 @@
-/*.rpm
 /0.1.6.tar.gz
 /0.1.7.tar.gz
 /0.1.8.tar.gz
 /0.1.9.tar.gz
 /0.1.10.tar.gz
 /0.1.11.tar.gz
-/testcloud-0.1.14.tar.gz
-/testcloud-0.1.15.tar.gz
-/testcloud-0.1.16.tar.gz
-/testcloud-0.1.17.tar.gz
-/testcloud-0.1.18.tar.gz
-/testcloud-0.2.0.tar.gz
-/testcloud-0.2.1.tar.gz
-/testcloud-0.2.2.tar.gz
-/testcloud-0.3.0.tar.gz
-/testcloud-0.3.1.tar.gz
-/testcloud-0.3.2.tar.gz
-/testcloud-0.3.3.tar.gz
-/testcloud-0.3.4.tar.gz
-/testcloud-0.3.5.tar.gz
-/testcloud-0.3.6.tar.gz
-/testcloud-0.3.7.tar.gz
-/testcloud-0.4.0.tar.gz
-/testcloud-0.5.0.tar.gz
-/testcloud-0.6.0.tar.gz
-/testcloud-0.6.1.tar.gz
-/testcloud-0.6.2.tar.gz

sources

@@ -1 +1 @@
-SHA512 (testcloud-0.6.2.tar.gz) = 0ea7feba89b2c596d9df6fc39d88b6f523bf378e746725b2216c2e5d2bb2ea6faa68ae09bcf33a9d53ee121201a89c9b23ec8b8bb2f1262e97d69be9886d48d8
+SHA512 (0.1.11.tar.gz) = 93c8afaf50c711a79c782ef872ab0bc6c182fb52a7e0a0acea13a19fc1efb5c0f759646cc6f3996c11624614c108389a828952cb5fcde53ec2e49583efefeaf5

testcloud.spec

@@ -1,24 +1,41 @@
+# sitelib for noarch packages, sitearch for others (remove the unneeded one)
+%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")}
+
 Name:           testcloud
-# Update also version in testcloud/__init__.py and docs/source/conf.py when changing this!
-Version:        0.6.2
-Release:        1%{?dist}
+Version:        0.1.11
+Release:        3%{?dist}
 Summary:        Tool for running cloud images locally
 
 License:        GPLv2+
-URL:            https://pagure.io/testcloud
-Source0:        https://releases.pagure.org/testcloud/%{name}-%{version}.tar.gz
+URL:            https://github.com/Rorosha/testCloud
+Source0:        https://github.com/Rorosha/%{name}/archive/%{version}.tar.gz
 
-ExclusiveArch: %{kernel_arches} noarch
 BuildArch:      noarch
 
 # Ensure we can create the testcloud group
 Requires(pre):  shadow-utils
 
+# testcloud integrates with libvirt
+Requires:       libvirt
+Requires:       libvirt-python
+
+# This is used to manipulate images on disk
+Requires:       libguestfs
+Requires:       libguestfs-tools
+
+# Used to download images from valid URLs
+Requires:       python-requests
+
 Requires:       polkit
+Requires:       python-jinja2
+Requires:       net-tools
 
-Recommends:     edk2-ovmf
+BuildRequires:  python2-devel
+BuildRequires:  python2-pytest
+BuildRequires:  python-pytest-cov
+BuildRequires:  python-setuptools
 
-Requires:       python3-%{name} = %{version}-%{release}
+# Provides:       python2-testcloud
 
 %description
 testcloud is a relatively simple system which is capable of booting images
@@ -26,32 +43,6 @@ designed for cloud systems on a local system with minimal configuration.
 testcloud is designed to be (and remain) somewhat simple, trading fancy cloud
 system features for ease of use and sanity in development.
 
-%package -n python3-%{name}
-Summary:        Python 3 interface to testcloud
-
-Obsoletes:      python2-testcloud <= %{version}-%{release}
-
-BuildRequires:  bash-completion
-BuildRequires:  python3-libvirt
-BuildRequires:  python3-devel
-BuildRequires:  python3-jinja2
-BuildRequires:  python3-mock
-BuildRequires:  python3-pytest
-BuildRequires:  python3-pytest-cov
-BuildRequires:  python3-requests
-BuildRequires:  python3-setuptools
-
-Requires:       libvirt
-Requires:       libguestfs-tools-c
-Requires:       python3-requests
-Requires:       python3-libvirt
-Requires:       python3-jinja2
-Requires:       python3-libguestfs
-Recommends:       fcct
-
-%description -n python3-%{name}
-Python 3 interface to testcloud.
-
 # Create the testcloud group
 %pre
 getent group testcloud >/dev/null || groupadd testcloud
@@ -59,15 +50,16 @@ getent group testcloud >/dev/null || groupadd testcloud
 %prep
 %setup -q -n %{name}-%{version}
 
+%check
+%{__python2} setup.py test
+# Remove compiled .py files from /etc after running unittests
+rm -f %{buildroot}%{_sysconfdir}/testcloud/*.py{c,o}
+
 %build
-%py3_build
+%{__python2} setup.py build
 
 %install
-%py3_install
-
-# Docs
-install -d %{buildroot}%{_mandir}/man1
-install -p -m 0644 manpages/testcloud.1 %{buildroot}%{_mandir}/man1
+%{__python2} setup.py install -O1 --skip-build --root %{buildroot}
 
 # configuration files
 mkdir -p %{buildroot}%{_sysconfdir}/testcloud/
@@ -79,9 +71,6 @@ install -d %{buildroot}%{_sharedstatedir}/testcloud/
 # Install domain jinja template for libvirt to import
 install conf/domain-template.jinja %{buildroot}/%{_sharedstatedir}/testcloud/domain-template.jinja
 
-# Install domain jinja coreos template for libvirt to import
-install conf/domain-coreos-template.jinja %{buildroot}/%{_sharedstatedir}/testcloud/domain-coreos-template.jinja
-
 # backingstores dir
 install -d %{buildroot}/%{_sharedstatedir}/testcloud/backingstores
 
@@ -92,225 +81,24 @@ install -d %{buildroot}/%{_sharedstatedir}/testcloud/instances
 mkdir -p %{buildroot}%{_sysconfdir}/polkit-1/rules.d
 install conf/99-testcloud-nonroot-libvirt-access.rules %{buildroot}%{_sysconfdir}/polkit-1/rules.d/99-testcloud-nonroot-libvirt-access.rules
 
-# Copy bash completion script
-mkdir -p %{buildroot}%{_datadir}/bash-completion/completions/
-install conf/testcloud-bash %{buildroot}%{_datadir}/bash-completion/completions/testcloud
-
-%check
-%pytest
-# Remove compiled .py files from /etc after os_install_post
-rm -f %{buildroot}%{_sysconfdir}/testcloud/*.py{c,o}
-rm -rf %{buildroot}%{_sysconfdir}/testcloud/__pycache__
-
 %files
-%doc README.md
-%{_mandir}/man1/testcloud.1*
+%doc README.rst
 %license LICENSE
+%{python2_sitelib}/testcloud
+%{python2_sitelib}/*.egg-info
 
 %dir %{_sysconfdir}/testcloud
 %dir %attr(0775, qemu, testcloud) %{_sharedstatedir}/testcloud
 %dir %attr(0775, qemu, testcloud) %{_sharedstatedir}/testcloud/backingstores
 %dir %attr(0775, qemu, testcloud) %{_sharedstatedir}/testcloud/instances
 %attr(0764, qemu, testcloud) %{_sharedstatedir}/testcloud/domain-template.jinja
-%attr(0764, qemu, testcloud) %{_sharedstatedir}/testcloud/domain-coreos-template.jinja
 
 %attr(0644, root, root) %{_sysconfdir}/polkit-1/rules.d/99-testcloud-nonroot-libvirt-access.rules
 
 %config(noreplace) %{_sysconfdir}/testcloud/settings.py
 %{_bindir}/testcloud
-%{_bindir}/t7d
-%{_datadir}/bash-completion/completions/testcloud
-
-%files -n python3-%{name}
-%{python3_sitelib}/testcloud
-%{python3_sitelib}/*.egg-info
 
 %changelog
-* Mon Sep 27 2021 Frantisek Zatloukal <fzatlouk@redhat.com> - 0.6.2-1
-- Workaround EL8 bug - waiting for sshd restart with user sessions
-- Add a basic integration test and plan for tmt
-- Fixes around backingstore cleanups
-- get_fedora_image_url: Proper support for branched, cleanups
-- get_fedora_image_url: Add info when user asks for wrong version
-- Don't use hammer solution to all Vagrant boxes, force-install cloud-init to known broken images
-- non-x86_64 support preparations and downloader code
-- Don't rely on working qemu://system
-
-* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.6.1-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
-
-* Wed Jul 21 2021 Frantisek Zatloukal <fzatlouk@redhat.com> - 0.6.1-1
-- Add wait and retry around dom.create()
-- lazy_refcounts=on and cache=unsafe
-- Bash completion (by lbrabec)
-- Let's have also short t7d binary
-- Add long project description for pypi
-- Style: Let's not have lines with hundreds of characters...
-- API: Add reboot function
-- FileLock: Make sure we don't overwrite config_data.DATA_DIR
-- Fix systems using systemd-networkd in user session mode
-
-* Fri Jul 09 2021 Frantisek Zatloukal <fzatlouk@redhat.com> - 0.6.0-1
-- SPEC: Use pytest macro
-- Merge downstream spec changes
-- README: Let's believe in testcloud a bit more 😎
-- Simplify cli warning wording a bit
-- Remove forced reboot from cli for CentOS user sessions
-- API: Allow to specify pci network device
-- README: improve a tiny bit
-- Make url mandatory, cleanup cli instance create a bit
-- Allow to specify number of CPU cores to be assigned
-- Change cli layout for instance create a bit (A LOT 😱 )
-- get_debian_image_url: return None on fail
-- Add a way to shutdown vms in a graceful way
-- use if hasattr insteadd of try/except AttributeError
-- Use virtio-net-pci instead of e1000 for hostfwd in qemu user sessions
-- implement synchronization using file lock for user sessions
-- Don't directly alter config_object, use a copy of it
-- Fixup CentOS short handle
-- Support Ubuntu and Debian images
-- Update url for oraculum
-- Bunch of code shuffling
-- Bunch of improvements for get_fedora_image_url
-- Fixup traceback for unknown distributions on un-defined variable
-- Fixups around system x session instances handling
-- Dont blow out traceback on image download 404, fixup connection tooltip for CentOS
-- Support fetching the latest Fedora Rawhide iso as fedora:rawhide url
-- Support CentOS and CentOS Stream versions (hardcoded urls)
-- Support operating with Vagrant images
-- check whether the instance existing before do the prepare work
-- Make the code more robust
-- Make list and clean functions more robust to handle both system and user sessions
-- add coreos test function
-
-* Fri Jun 04 2021 Python Maint <python-maint@redhat.com> - 0.5.0-2
-- Rebuilt for Python 3.10
-
-* Mon Mar 22 2021 Frantisek Zatloukal <fzatlouk@redhat.com> - 0.5.0-1
-- Fix crash in _handle_connection_tip
-- Allow to create an instance without specifying a name
-- Fix instance.image_path
-- Make network working in qemu:///session
-
-* Wed Dec 16 2020 Frantisek Zatloukal <fzatlouk@redhat.com> - 0.4.0-1
-- Support creating instances by fedora:XX, fedora:latest and fedora:qa-matrix strings
-- Implement auto cleaning of backingstore
-- Make testcloud compatible with future Python 3.10
-- Adapt to requests defaulting to simplejson if present
-- Don't throw out exception when trying to create instance already existing in libvirt
-- --all is now the default in testcloud instance list
-- Show some hints to the users on instance create/start
-- cleanup the instance bits when instance create fails
-
-* Mon Nov 16 2020 Frantisek Zatloukal <fzatlouk@redhat.com> - 0.3.7-1
-- Do not throw out ugly tracebacks if user uses cli (#1887815)
-- Parse CMD_LINE_ARGS and add CMD_LINE_ENVS (https://pagure.io/testcloud/issue/49)
-- Add try/except check to instance.prepare() as permissions error can occur there too
-- Update documentation
-- Add manpage
-
-* Fri Oct 09 2020 Frantisek Zatloukal <fzatlouk@redhat.com> - 0.3.6-1
-- Improve user experience when testcloud fails because of missing group
-
-* Thu Aug 27 2020 Frantisek Zatloukal <fzatlouk@redhat.com> - 0.3.5-4
-- ExclusiveArch to prevent koji from trying to build this on i686
-
-* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.3.5-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
-* Tue May 26 2020 Miro Hrončok <mhroncok@redhat.com> - 0.3.5-2
-- Rebuilt for Python 3.9
-
-* Fri May 22 2020 Frantisek Zatloukal <fzatlouk@redhat.com> - 0.3.5-1
-- Typo fix in RHEL 8 qemu-kvm naming workaround
-
-* Thu May 21 2020 Frantisek Zatloukal <fzatlouk@redhat.com> - 0.3.4-1
-- Ugly hotfix for tmt
-
-* Wed May 20 2020 Frantisek Zatloukal <fzatlouk@redhat.com> - 0.3.3-1
-- Support RHEL 8 hosts (different qemu-kvm path)
-- Move most of the deps into python3-testcloud
-
-* Sun Apr 19 2020 Frantisek Zatloukal <fzatlouk@redhat.com> - 0.3.2-1
-- Require only libguestfs-tools-c from libguestfs
-- Bump default RAM size to 768 MB
-- Fix for libvirt >= 6.0
-- Fix DeprecationWarning: invalid escape sequence \w
-
-* Mon Mar 02 2020 Frantisek Zatloukal <fzatlouk@redhat.com> - 0.3.1-1
-- Remove Python 2 support
-- Raise TestcloudImageError if failed to open file
-- instance: call qemu-img in quiet mode
-
-* Fri Jan 31 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.3.0-5
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
-
-* Thu Oct 03 2019 Miro Hrončok <mhroncok@redhat.com> - 0.3.0-4
-- Rebuilt for Python 3.8.0rc1 (#1748018)
-
-* Mon Aug 19 2019 Miro Hrončok <mhroncok@redhat.com> - 0.3.0-3
-- Rebuilt for Python 3.8
-
-* Sat Jul 27 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.3.0-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
-
-* Wed May 22 2019 Frantisek Zatloukal <fzatlouk@redhat.com> - 0.3.0-1
-- Support creating UEFI VMs
-
-* Sun Feb 03 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.2.2-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
-
-* Tue Nov 20 2018 Frantisek Zatloukal <fzatlouk@redhat.com> - 0.2.2-1
-- drop and obsolete python2-testcloud on Fedora >= 30
-- Fix setup.py test to also work with Python 3 (pytest-3)
-
-* Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.2.1-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
-
-* Mon Jul 02 2018 Miro Hrončok <mhroncok@redhat.com> - 0.2.1-2
-- Rebuilt for Python 3.7
-
-* Fri Jun 29 2018 Frantisek Zatloukal <fzatlouk@redhat.com> - 0.2.1-1
-- domain-template: use cpu host-passthrough
-- domain-template: use urandom for RNG
-
-* Tue Jun 19 2018 Miro Hrončok <mhroncok@redhat.com> - 0.2.0-2
-- Rebuilt for Python 3.7
-
-* Wed May 30 2018 Frantisek Zatloukal <fzatlouk@redhat.com> - 0.2.0-1
-- Drop Fedora 26
-- Use Python 3 by default
-- Remove shebangs from non-executables
-- Split testcloud into testcloud, python2-testcloud and python3-testcloud
-
-* Wed May 02 2018 Frantisek Zatloukal <fzatlouk@redhat.com> - 0.1.18-1
-- Host /dev/random passthrough
-
-* Tue Mar 06 2018 Frantisek Zatloukal <fzatlouk@redhat.com> - 0.1.17-1
-- Add instance clean command
-- Ignore error when domain stopped between stop attempts
-- Add Makefile
-
-* Tue Feb 20 2018 Frantisek Zatloukal <fzatlouk@redhat.com> - 0.1.16-1
-- Retry to stop instance when host is busy
-
-* Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.1.15-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
-
-* Fri Feb 02 2018 Frantisek Zatloukal <fzatlouk@redhat.com> - 0.1.15-2
-- Update Python 2 dependency declarations to new packaging standards
-  (See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3)
-
-* Thu Oct 26 2017 Kamil Páral <kparal@redhat.com> - 0.1.15-1
-- keep backwards compatible API
-
-* Thu Oct 26 2017 Kamil Páral <kparal@redhat.com> - 0.1.14-1
-- replace arp with libvirt method (lose dep on net-tools)
-- fix test suite in spec file
-
-* Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0.1.11-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
-
 * Wed Feb 22 2017 Kamil Páral <kparal@redhat.com> - 0.1.11-3
 - don't install py[co] files into /etc