9 changed files with 187 additions and 118 deletions
--- a/.ansible-core.metadata
+++ b/.ansible-core.metadata
@ -0,0 +1,6 @@
+560f248ccb0b98256c5b50c86a002c2c1e57edb6 SOURCES/Jinja2-3.1.2.tar.gz
+acb6dca5cbec84f4c707225a8b6b2505fae28c90 SOURCES/MarkupSafe-2.1.0.tar.gz
+b7e3b3c247a445c1986e5ec350b13bb1984a7207 SOURCES/ansible-core-2.14.2.tar.gz
+b99fa7af153646722b2d1817bb09906cc5a94bc6 SOURCES/packaging-20.4.tar.gz
+ca8d892c93fe2d54ea5e6f31c5798e40c58e8667 SOURCES/pyparsing-2.4.7.tar.gz
+ae564e766fc147e87d7f009d42b5204b7ae3a832 SOURCES/resolvelib-0.5.4.tar.gz
--- a/.gitignore
+++ b/.gitignore
@ -4,25 +4,3 @@ SOURCES/ansible-core-2.14.2.tar.gz
 SOURCES/packaging-20.4.tar.gz
 SOURCES/pyparsing-2.4.7.tar.gz
 SOURCES/resolvelib-0.5.4.tar.gz
-/Jinja2-3.1.2.tar.gz
-/MarkupSafe-2.1.0.tar.gz
-/ansible-core-2.14.2.tar.gz
-/packaging-20.4.tar.gz
-/pyparsing-2.4.7.tar.gz
-/resolvelib-0.5.4.tar.gz
-/MarkupSafe-2.1.2.tar.gz
-/ansible-core-2.15.0.tar.gz
-/packaging-21.3.tar.gz
-/pyparsing-3.0.7.tar.gz
-/resolvelib-1.0.1.tar.gz
-/ansible-core-2.15.1.tar.gz
-/ansible-core-2.15.2.tar.gz
-/ansible-core-2.15.3.tar.gz
-/ansible-documentation-2.15.3.tar.gz
-/docutils-0.20.1.tar.gz
-/ansible-core-2.16.1.tar.gz
-/ansible-documentation-2.16.1.tar.gz
-/ansible-core-2.16.2.tar.gz
-/ansible-documentation-2.16.2.tar.gz
-/ansible-core-2.16.3.tar.gz
-/ansible-documentation-2.16.3.tar.gz
--- a/SOURCES/0001-fix-vendoring-support-80074.patch
+++ b/SOURCES/0001-fix-vendoring-support-80074.patch
@ -0,0 +1,154 @@
+From f619460ee6bf491b87fd3cb788422fd4937e87c5 Mon Sep 17 00:00:00 2001
+From: eabdullin <ed.abdullin.1@gmail.com>
+Date: Thu, 13 Jul 2023 17:54:46 +0300
+Subject: [PATCH] - Patch was generated from
+ https://github.com/ansible/ansible/commit/4a3f5b71678c2f23f31c636472bbc0fd30c3e7e8
+ and adapted
+
+---
+ .../ansible-test-vendoring-support.yml        |  3 ++
+ .../targets/ansible-test-vendoring/aliases    |  5 +++
+ .../ns/col/tests/config.yml                   |  4 +++
+ .../targets/ansible-test-vendoring/runme.sh   | 33 +++++++++++++++++++
+ test/lib/ansible_test/_internal/payload.py    |  8 +++++
+ test/lib/ansible_test/_internal/util.py       | 17 ++++++++++
+ 6 files changed, 70 insertions(+)
+ create mode 100644 changelogs/fragments/ansible-test-vendoring-support.yml
+ create mode 100644 test/integration/targets/ansible-test-vendoring/aliases
+ create mode 100644 test/integration/targets/ansible-test-vendoring/ansible_collections/ns/col/tests/config.yml
+ create mode 100644 test/integration/targets/ansible-test-vendoring/runme.sh
+
+diff --git a/changelogs/fragments/ansible-test-vendoring-support.yml b/changelogs/fragments/ansible-test-vendoring-support.yml
+new file mode 100644
+index 0000000..234268a
+--- /dev/null
+++ b/changelogs/fragments/ansible-test-vendoring-support.yml
+@@ -0,0 +1,3 @@
+bugfixes:
+  - ansible-test - Support loading of vendored Python packages from ansible-core.
+  - ansible-test - Exclude ansible-core vendored Python packages from ansible-test payloads.
+diff --git a/test/integration/targets/ansible-test-vendoring/aliases b/test/integration/targets/ansible-test-vendoring/aliases
+new file mode 100644
+index 0000000..09cbf4b
+--- /dev/null
+++ b/test/integration/targets/ansible-test-vendoring/aliases
+@@ -0,0 +1,5 @@
+shippable/posix/group3  # runs in the distro test containers
+shippable/generic/group1  # runs in the default test container
+context/controller
+needs/target/collection
+destructive  # adds and then removes packages into lib/ansible/_vendor/
+diff --git a/test/integration/targets/ansible-test-vendoring/ansible_collections/ns/col/tests/config.yml b/test/integration/targets/ansible-test-vendoring/ansible_collections/ns/col/tests/config.yml
+new file mode 100644
+index 0000000..c73de69
+--- /dev/null
+++ b/test/integration/targets/ansible-test-vendoring/ansible_collections/ns/col/tests/config.yml
+@@ -0,0 +1,4 @@
+# This config file is included to cause ansible-test to import the `packaging` module.
+
+modules:
+  python_requires: default
+diff --git a/test/integration/targets/ansible-test-vendoring/runme.sh b/test/integration/targets/ansible-test-vendoring/runme.sh
+new file mode 100644
+index 0000000..fa6f652
+--- /dev/null
+++ b/test/integration/targets/ansible-test-vendoring/runme.sh
+@@ -0,0 +1,33 @@
+#!/usr/bin/env bash
+
+set -eux
+
+# Run import sanity tests which require modifications to the source directory.
+
+vendor_dir="$(python -c 'import pathlib, ansible._vendor; print(pathlib.Path(ansible._vendor.__file__).parent)')"
+
+mkdir "${vendor_dir}/packaging/"  # intended to fail if packaging is already present (to avoid deleting it later)
+
+cleanup() {
+    rm -rf "${vendor_dir}/packaging/"
+}
+
+trap cleanup EXIT
+
+# Verify that packages installed in the vendor directory are loaded by ansible-test.
+# This is done by injecting a broken `packaging` package, which should cause ansible-test to fail.
+
+echo 'raise Exception("intentional failure from ansible-test-vendoring integration test")' > "${vendor_dir}/packaging/__init__.py"
+
+if ansible-test sanity --test import --color --truncate 0 "${@}" > output.log 2>&1; then
+    echo "ansible-test did not exit with a non-zero status"
+    cat output.log
+    exit 1
+fi
+
+if ! grep '^Exception: intentional failure from ansible-test-vendoring integration test$' output.log; then
+    echo "ansible-test did not fail with the expected output"
+    cat output.log
+    exit 1
+fi
+
+diff --git a/test/lib/ansible_test/_internal/payload.py b/test/lib/ansible_test/_internal/payload.py
+index 94150cb..5de976b 100644
+--- a/test/lib/ansible_test/_internal/payload.py
+++ b/test/lib/ansible_test/_internal/payload.py
+@@ -46,6 +46,14 @@ def create_payload(args: CommonConfig, dst_path: str) -> None:
+     files = list(data_context().ansible_source)
+     filters = {}
+ 
+    # Exclude vendored files from the payload.
+    # They may not be compatible with the delegated environment.
+    files = [
+        (abs_path, rel_path) for abs_path, rel_path in files
+        if not rel_path.startswith('lib/ansible/_vendor/')
+        or rel_path == 'lib/ansible/_vendor/__init__.py'
+    ]
+
+     def make_executable(tar_info: tarfile.TarInfo) -> t.Optional[tarfile.TarInfo]:
+         """Make the given file executable."""
+         tar_info.mode |= stat.S_IXUSR | stat.S_IXOTH | stat.S_IXGRP
+diff --git a/test/lib/ansible_test/_internal/util.py b/test/lib/ansible_test/_internal/util.py
+index 1231623..592b07a 100644
+--- a/test/lib/ansible_test/_internal/util.py
+++ b/test/lib/ansible_test/_internal/util.py
+@@ -24,10 +24,14 @@ import time
+ import functools
+ import shlex
+ import typing as t
+import warnings
+ 
+ from struct import unpack, pack
+ from termios import TIOCGWINSZ
+ 
+# CAUTION: Avoid third-party imports in this module whenever possible.
+#          Any third-party imports occurring here will result in an error if they are vendored by ansible-core.
+
+ try:
+     from typing_extensions import TypeGuard  # TypeGuard was added in Python 3.10
+ except ImportError:
+@@ -339,6 +343,17 @@ def get_ansible_version() -> str:
+     return ansible_version
+ 
+ 
+def _enable_vendoring() -> None:
+    """Enable support for loading Python packages vendored by ansible-core."""
+    # Load the vendoring code by file path, since ansible may not be in our sys.path.
+    # Convert warnings into errors, to avoid problems from surfacing later.
+
+    with warnings.catch_warnings():
+        warnings.filterwarnings('error')
+
+        load_module(os.path.join(ANSIBLE_LIB_ROOT, '_vendor', '__init__.py'), 'ansible_vendor')
+
+
+ @cache
+ def get_available_python_versions() -> dict[str, str]:
+     """Return a dictionary indicating which supported Python versions are available."""
+@@ -1148,3 +1163,5 @@ def type_guard(sequence: c.Sequence[t.Any], guard_type: t.Type[C]) -> TypeGuard[
+ 
+ 
+ display = Display()  # pylint: disable=locally-disabled, invalid-name
+
+_enable_vendoring()
+-- 
+2.39.2 (Apple Git-143)
+
--- a/SOURCES/ansible-test-data-files.txt
+++ b/SOURCES/ansible-test-data-files.txt
--- a/SOURCES/remove-bundled-deps-from-requirements.patch
+++ b/SOURCES/remove-bundled-deps-from-requirements.patch
@ -1,5 +1,5 @@
 diff --git a/requirements.txt b/requirements.txt
-index 5eaf9f2cbc..792daa209a 100644
+index 20562c3e0f..792daa209a 100644
 --- a/requirements.txt
 +++ b/requirements.txt
@@ -3,13 +3,5 @@
@ -15,4 +15,4 @@ index 5eaf9f2cbc..792daa209a 100644
 -# NOTE: Ref: https://github.com/sarugaku/resolvelib/issues/69
 -# NOTE: When updating the upper bound, also update the latest version used
 -# NOTE: in the ansible-galaxy-collection test suite.
-resolvelib >= 0.5.3, < 1.1.0  # dependency resolver used by ansible-galaxy
+-resolvelib >= 0.5.3, < 0.9.0  # dependency resolver used by ansible-galaxy
--- a/SPECS/ansible-core.spec
+++ b/SPECS/ansible-core.spec
@ -1,5 +1,5 @@
-%global __python3 /usr/bin/python3.12
-%global python3_pkgversion 3.12
+%global __python3 /usr/bin/python3.11
+%global python3_pkgversion 3.11

 # We need this because we are no longer noarch, since our bundled deps might
 # conceivably need to compile arch-specific things. But we currently have no
@ -8,7 +8,7 @@

 # Disable shebang munging for specific paths.  These files are data files.
 # ansible-test munges the shebangs itself.
-%global __brp_mangle_shebangs_exclude_from_file %{SOURCE2}
+%global __brp_mangle_shebangs_exclude_from_file %{SOURCE1}

 # NOTE(pabelanger): Don't auto add pwsh as Requires for ansible-test. We do
 # not wish to package it.
@ -27,37 +27,33 @@
 %define vendor_pip %{__python3} -m pip install --no-deps -v --no-build-isolation --no-binary :all: -t %{vendor_path}

 # These control which bundled dep versions we pin against
-%global docutils_version 0.20.1
 %global jinja2_version 3.1.2
-%global markupsafe_version 2.1.2
-%global packaging_version 21.3
-%global pyparsing_version 3.0.7
-%global resolvelib_version 1.0.1
+%global markupsafe_version 2.1.0
+%global packaging_version 20.4
+%global pyparsing_version 2.4.7
+%global resolvelib_version 0.5.4


 Name: ansible-core
 Summary: SSH-based configuration management, deployment, and task execution system
-Version: 2.16.3
-Release: 2%{?dist}
+Version: 2.14.2
+Release: 4%{?dist}.alma
 ExcludeArch: i686

 Group: Development/Libraries
 License: GPLv3+
 Source0: https://files.pythonhosted.org/packages/source/a/ansible-core/ansible-core-%{version}.tar.gz
-Source1: https://github.com/ansible/ansible-documentation/archive/v%{version}/ansible-documentation-%{version}.tar.gz
-Source2: ansible-test-data-files.txt
+Source1: ansible-test-data-files.txt

 # And bundled deps
-Source3: https://files.pythonhosted.org/packages/source/J/Jinja2/Jinja2-%{jinja2_version}.tar.gz
-Source4: https://files.pythonhosted.org/packages/source/M/MarkupSafe/MarkupSafe-%{markupsafe_version}.tar.gz
-Source5: https://files.pythonhosted.org/packages/source/p/packaging/packaging-%{packaging_version}.tar.gz
-Source6: https://files.pythonhosted.org/packages/source/p/pyparsing/pyparsing-%{pyparsing_version}.tar.gz
-Source7: https://files.pythonhosted.org/packages/source/r/resolvelib/resolvelib-%{resolvelib_version}.tar.gz
-
-# Deps to build manpages
-Source8: https://sourceforge.net/projects/docutils/files/docutils/%{docutils_version}/docutils-%{docutils_version}.tar.gz
+Source2: https://files.pythonhosted.org/packages/source/J/Jinja2/Jinja2-%{jinja2_version}.tar.gz
+Source3: https://files.pythonhosted.org/packages/source/M/MarkupSafe/MarkupSafe-%{markupsafe_version}.tar.gz
+Source4: https://files.pythonhosted.org/packages/source/p/packaging/packaging-%{packaging_version}.tar.gz
+Source5: https://files.pythonhosted.org/packages/source/p/pyparsing/pyparsing-%{pyparsing_version}.tar.gz
+Source6: https://files.pythonhosted.org/packages/source/r/resolvelib/resolvelib-%{resolvelib_version}.tar.gz

 Patch0: remove-bundled-deps-from-requirements.patch
+Patch0001: 0001-fix-vendoring-support-80074.patch

 URL: http://ansible.com

@ -93,6 +89,7 @@ BuildRequires: make git-core gcc
 Requires: git-core
 Requires: python%{python3_pkgversion}-PyYAML >= 5.1
 Requires: python%{python3_pkgversion}-cryptography
+Requires: python%{python3_pkgversion}-six
 Requires: sshpass

 %description
@ -117,8 +114,9 @@ This package installs the ansible-test command for testing modules and plugins
 developed for ansible.

 %prep
-%setup -q -b1 -b3 -b4 -b5 -b6 -b7 -b8 -n ansible-core-%{version}
+%setup -q -b2 -b3 -b4 -b5 -b6 -n ansible-core-%{version}
 %patch0 -p1
+%patch0001 -p1

 # Fix all Python shebangs recursively in ansible-test
 %{py3_shebang_fix} test/lib/ansible_test
@ -174,20 +172,13 @@ done
 mkdir -p %{buildroot}%{_sysconfdir}/ansible/
 mkdir -p %{buildroot}%{_sysconfdir}/ansible/roles/

-cp ../ansible-documentation-%{version}/examples/hosts %{buildroot}%{_sysconfdir}/ansible/
-cp ../ansible-documentation-%{version}/examples/ansible.cfg %{buildroot}%{_sysconfdir}/ansible/
-
+cp examples/hosts %{buildroot}%{_sysconfdir}/ansible/
+cp examples/ansible.cfg %{buildroot}%{_sysconfdir}/ansible/
 mkdir -p %{buildroot}/%{_mandir}/man1/

-mkdir -p docs/man/man1
-mkdir -p /tmp/_docutils
-%{__python3} -m pip install ../docutils-%{docutils_version} -t /tmp/_docutils --no-build-isolation
-PYTHONPATH=%{vendor_path}:/tmp/_docutils %{__python3} packaging/cli-doc/build.py man --output-dir docs/man/man1
-rm -rf /tmp/_docutils
-
 cp -v docs/man/man1/*.1 %{buildroot}/%{_mandir}/man1/

-cp -pr ../ansible-documentation-%{version}/docs/docsite/rst .
+cp -pr docs/docsite/rst .
 cp -p lib/ansible_core.egg-info/PKG-INFO .

 strip --strip-unneeded %{vendor_path}/markupsafe/_speedups%{python3_ext_suffix}
@ -197,7 +188,7 @@ strip --strip-unneeded %{vendor_path}/markupsafe/_speedups%{python3_ext_suffix}
 %{_bindir}/ansible*
 %exclude %{_bindir}/ansible-test
 %config(noreplace) %{_sysconfdir}/ansible/
-%doc README.md PKG-INFO COPYING
+%doc README.rst PKG-INFO COPYING
 %doc changelogs/CHANGELOG-v2.*.rst
 %doc %{_mandir}/man1/ansible*
 %{_datadir}/ansible/
@ -210,38 +201,8 @@ strip --strip-unneeded %{vendor_path}/markupsafe/_speedups%{python3_ext_suffix}
 %{python3_sitelib}/ansible_test

 %changelog
-* Mon Feb 05 2024 Dimitri Savineau <dsavinea@redhat.com> - 2.16.3-2
- rebuild with python 3.12 (RHEL-24141)
-
-* Fri Feb 02 2024 Dimitri Savineau <dsavinea@redhat.com> - 2.16.3-1
- ansible-core 2.16.3 release (RHEL-23782)
- Fix CVE-2024-0690 (possible information leak in tasks that ignore
-  ANSIBLE_NO_LOG configuration) (RHEL-22123)
-
-* Tue Dec 12 2023 Dimitri Savineau <dsavinea@redhat.com> - 2.16.2-1
- ansible-core 2.16.2 release (RHEL-19297)
-
-* Thu Dec 07 2023 Dimitri Savineau <dsavinea@redhat.com> - 2.16.1-1
- ansible-core 2.16.1 release (RHEL-18965)
-
-* Wed Aug 16 2023 Dimitri Savineau <dsavinea@redhat.com> - 2.15.3-1
- ansible-core 2.15.3 release (rhbz#2232431)
- Use docs and examples from ansible-documentation project.
- Build the manpages.
-
-* Mon Aug 14 2023 Dimitri Savineau <dsavinea@redhat.com> - 2.15.2-1
- ansible-core 2.15.2 release (rhbz#2231891)
-
-* Tue Jul 04 2023 Dimitri Savineau <dsavinea@redhat.com> - 2.15.1-1
- ansible-core 2.15.1 release (rhbz#2219620)
-
-* Mon May 15 2023 Dimitri Savineau <dsavinea@redhat.com> - 2.15.0-1
- ansible-core 2.15.0 release (rhbz#2204511)
- update bundled markupsafe to 2.1.2.
- update bundled packaging to 21.3.
- update bundled pyparsing to 3.0.7.
- update bundled resolvelib to 1.0.1.
- remove six runtime dependency.
+* Thu Jul 13 2023 Eduard Abdullin <eabdullin@almalinux.org> - 2.14.2-4.alma
+- Apply 0001-fix-vendoring-support-80074.patch

 * Tue Feb 14 2023 Dimitri Savineau <dsavinea@redhat.com> - 2.14.2-3
 - rebuild with python 3.11 (rhbz#2169524)
--- a/gating.yaml
+++ b/gating.yaml
@ -1,6 +0,0 @@
--- !Policy
-product_versions:
-  - rhel-8
-decision_context: osci_compose_gate
-rules:
-  - !PassingTestCaseRule {test_case_name: osci.brew-build.tier0.functional}
--- a/8
+++ b/8
@ -1,8 +0,0 @@
-SHA512 (ansible-core-2.16.3.tar.gz) = 62b7d23d3d639f118a4b87dccc02ec5f373fd56ae6c5fb56c8adf0818d0f5bbf3b6de47a29da9ef2d8c3f4b7e3a99978677bc9bfda1eb4cb9640b79abb763f77
-SHA512 (ansible-documentation-2.16.3.tar.gz) = c073b0b961e38bee560be78e2c12534facec891f6e375df14fdcaf99241f711cf6955ee58b936f7f23ab62a732d2dbde5fd279976989be06e747c2bf3db41661
-SHA512 (docutils-0.20.1.tar.gz) = a0ddca315d03677003036d6a8052ac96fbd3fcc4508564938ea684d79bedb4d322d83449c7b26e55b19b0aadd6e46ca9ac409bb16279a20f06c70e9c15ef5eb0
-SHA512 (Jinja2-3.1.2.tar.gz) = 5dfe122c1beef5305b34d25f22f96607bd3a6cba098b03091850ea36fefe62b645a7218d7584b35bea252393ac922c9bb3654a9e90f23bcfb273e811fcf2f2c1
-SHA512 (MarkupSafe-2.1.2.tar.gz) = 84dbeddaf2df713b3cce94eb64876fea8f80c608e25130c18e4691be2b1dea56df8b772d26c0caca88231ef795125eb9678210c33bf20518c18e3047912ddb4b
-SHA512 (packaging-21.3.tar.gz) = 2e3aa276a4229ac7dc0654d586799473ced9761a83aa4159660d37ae1a2a8f30e987248dd0e260e2834106b589f259a57ce9936eef0dcc3c430a99ac6b663e05
-SHA512 (pyparsing-3.0.7.tar.gz) = 1e692f4cdaa6b6e8ca2729d0a3e2ba16d978f1957c538b6de3a4220ec7d996bdbe87c41c43abab851fffa3b0498a05841373e435602917b8c095042e273badb5
-SHA512 (resolvelib-1.0.1.tar.gz) = 52c872fb2a22c47de022a661dc4d8de8c6af450f1cff6f2b99cd91bf7eccae5b6ee223793f50b9679c1c6caedbd8bb63330915ee6f10533b1a0ed239d068b36f
--- a/tests/tests.yml
+++ b/tests/tests.yml
@ -1,16 +0,0 @@
---
- hosts: localhost
-  gather_facts: yes
-  roles:
-  - role: standard-test-basic
-    tags:
-    - classic
-    tests:
-    - simple:
-        dir: .
-        run: /usr/bin/ansible localhost -m dnf -a "list=installed"
-#  tasks:
-      # This is only used as part of rpm-ostree which has extensive tests
-      # and there is no point to testing it separately.
-      #      - name: true
-      #        shell: true