From 9781dbb34b2bd9daa686323aaec1e108c55a2d1b Mon Sep 17 00:00:00 2001
From: Cleber Rosa <crosa@redhat.com>
Date: Mon, 17 Jul 2023 19:11:20 -0400
Subject: [PATCH] Sync with upstream release 102.0

Signed-off-by: Cleber Rosa <crosa@redhat.com>
---
 .gitignore          |  1 +
 python-avocado.spec | 45 ++++++++++++++++++++++++++++++++++++++++-----
 sources             |  2 +-
 3 files changed, 42 insertions(+), 6 deletions(-)

diff --git a/.gitignore b/.gitignore
index da5fe2e..aed8c8e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -41,3 +41,4 @@
 /avocado-96.0.tar.gz
 /avocado-97.0.tar.gz
 /avocado-98.0.tar.gz
+/avocado-102.0.tar.gz
diff --git a/python-avocado.spec b/python-avocado.spec
index d8f59c3..8dc86ad 100644
--- a/python-avocado.spec
+++ b/python-avocado.spec
@@ -36,7 +36,7 @@
 %endif
 
 Name: python-avocado
-Version: 98.0
+Version: 102.0
 Release: 1%{?gitrel}%{?dist}
 Summary: Framework with tools and libraries for Automated Testing
 # Found licenses:
@@ -76,6 +76,7 @@ BuildRequires: psmisc
 BuildRequires: perl-Test-Harness
 BuildRequires: python3-elementpath
 BuildRequires: python3-xmlschema
+BuildRequires: ansible-core
 %endif
 BuildRequires: glibc-all-langpacks
 BuildRequires: python3-netifaces
@@ -110,6 +111,11 @@ popd
 pushd optional_plugins/golang
     %py3_build
 popd
+%if ! 0%{?rhel}
+pushd optional_plugins/ansible
+    %py3_build
+popd
+%endif
 pushd optional_plugins/varianter_pict
     %py3_build
 popd
@@ -125,7 +131,6 @@ rst2man man/avocado.rst man/avocado.1
 %py3_install
 for exe in \
     avocado \
-    avocado-runner \
     avocado-runner-noop \
     avocado-runner-dry-run \
     avocado-runner-exec-test \
@@ -134,6 +139,7 @@ for exe in \
     avocado-runner-tap \
     avocado-runner-asset \
     avocado-runner-package \
+    avocado-runner-podman-image \
     avocado-runner-sysinfo \
     avocado-external-runner \
     avocado-software-manager
@@ -161,6 +167,11 @@ popd
 pushd optional_plugins/golang
     %py3_install
 popd
+%if ! 0%{?rhel}
+pushd optional_plugins/ansible
+    %py3_install
+popd
+%endif
 pushd optional_plugins/varianter_pict
     %py3_install
 popd
@@ -234,9 +245,6 @@ these days a framework) to perform automated testing.
 %{_bindir}/avocado-%{python3_version}
 %{_bindir}/avocado-3
 %{_bindir}/avocado
-%{_bindir}/avocado-runner-%{python3_version}
-%{_bindir}/avocado-runner-3
-%{_bindir}/avocado-runner
 %{_bindir}/avocado-runner-noop-%{python3_version}
 %{_bindir}/avocado-runner-noop-3
 %{_bindir}/avocado-runner-noop
@@ -261,6 +269,9 @@ these days a framework) to perform automated testing.
 %{_bindir}/avocado-runner-package-%{python3_version}
 %{_bindir}/avocado-runner-package-3
 %{_bindir}/avocado-runner-package
+%{_bindir}/avocado-runner-podman-image-%{python3_version}
+%{_bindir}/avocado-runner-podman-image-3
+%{_bindir}/avocado-runner-podman-image
 %{_bindir}/avocado-runner-sysinfo-%{python3_version}
 %{_bindir}/avocado-runner-sysinfo-3
 %{_bindir}/avocado-runner-sysinfo
@@ -359,6 +370,24 @@ also run them.
 %{_bindir}/avocado-runner-golang
 
 
+%if ! 0%{?rhel}
+%package -n python3-avocado-plugins-ansible
+Summary: Avocado Ansible Dependency plugin
+License: GPLv2+
+Requires: python3-avocado == %{version}-%{release}
+Requires: ansible-core
+
+%description -n python3-avocado-plugins-ansible
+Adds to Avocado the ability to use ansible modules as dependecies for
+tests.
+
+%files -n python3-avocado-plugins-ansible
+%{python3_sitelib}/avocado_ansible*
+%{python3_sitelib}/avocado_framework_plugin_ansible*
+%{_bindir}/avocado-runner-ansible-module
+%endif
+
+
 %package -n python3-avocado-plugins-varianter-pict
 Summary: Varianter with combinatorial capabilities by PICT
 License: GPLv2+
@@ -444,6 +473,12 @@ Again Shell code (and possibly other similar shells).
 
 
 %changelog
+* Mon Jul 17 2023 Cleber Rosa <crosa@redhat.com> - 102.0-1
+- Sync with upstream release 102.0
+- Added new avocado-runner-podman-image script
+- Added new sub package python3-avocado-plugins-ansible
+- Remove generic runner avocado-runner
+
 * Sat Jul 16 2022 Cleber Rosa <crosa@redhat.com> - 98.0-1
 - Sync with upstream release 98.0
 - Add build requirements for python3-elementpath and
diff --git a/sources b/sources
index c029b01..df8cd21 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (avocado-98.0.tar.gz) = 6e1adbc5a797a7775204418411a7d80afdce1626894ebe054072b22426f41ba5f6544720f83169158bdb3187bd2432387622f8a654d750d49784a183148ed2f0
+SHA512 (avocado-102.0.tar.gz) = 8c772fd4bef31ed04072e52a88a1d3af7bd28021573d138beacac270774e89b801f8430e80e46453a6c8dc51fe4472310d294271a1e801fbb31dc1dae2b7b1c3