New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
[stable-2.12] ansible-test - Improve container management. #79611
Merged
mattclay
merged 41 commits into
ansible:stable-2.12
from
mattclay:at-container-management-2.12
Dec 16, 2022
Merged
[stable-2.12] ansible-test - Improve container management. #79611
mattclay
merged 41 commits into
ansible:stable-2.12
from
mattclay:at-container-management-2.12
Dec 16, 2022
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…sible#75498) (cherry picked from commit e50ad6f)
@mattclay This PR was evaluated as a potentially problematic PR for the following reasons:
Such PR can only be merged by human. Contact a Core team member to review this PR on IRC: |
ansibot
added
affects_2.12
backport
This PR does not target the devel branch.
feature
This issue/PR relates to a feature request.
needs_rebase
https://docs.ansible.com/ansible/devel/dev_guide/developing_rebasing.html
needs_revision
This PR fails CI tests or a maintainer has requested a review/revision of the PR.
needs_triage
Needs a first human triage before being processed.
labels
Dec 16, 2022
mattclay
removed
the
needs_triage
Needs a first human triage before being processed.
label
Dec 16, 2022
* Move RHEL pip package install into function. * Add RHEL 9 support to bootstrap script. * ansible-test - Add RHEL 9 support. * Add install and uninstall instructions for RHEL9 to paramiko tests * Skip incidental_inventory_docker_swarm on RHEL 9. * Update dnf tests for rhel9 * Fix prepare_http_tests on RHEL 9. * fix RHEL9 Python discovery tests to match distro map * Skip subversion test on RHEL 9.0b. Co-authored-by: Matt Martz <matt@sivel.net> Co-authored-by: Matt Davis <mrd@redhat.com> (cherry picked from commit 730194e)
* `podman inspect` falls back to a same-named image if the named container is not present; since eg `http-test-container` is both the name of the image and container, it wasn't working properly under podman in many instances. Switching to `docker|podman container inspect` limits the query to containers only for both podman and docker, allowing the support container detection/creation to work properly. (cherry picked from commit abac141)
* Add missing typing imports. * Remove unnecessary non-capturing group. * Whitespace. * Add type hints. * Ignore PyCharm false positives. * Remove Python 2.x plugin loading logic. * Remove Python 2.x exception handling. * Remove Python 2.x display logic. * Add changelog. (cherry picked from commit 4e70156)
(cherry picked from commit d2daa67)
This fixes a traceback when loading plugins that use dataclasses. (cherry picked from commit 7e814dd)
* ansible-test - Remove AIX provisioning support. * Remove `skip/aix` integration test aliases. * Remove build for AIX binary module. (cherry picked from commit 3a89182)
The correct error strategy for the to_text method is surrogate_or_strict Signed-off-by: Dimitri Savineau <dsavinea@redhat.com> (cherry picked from commit a0f6747)
* ansible-test - Improve help for unsupported cwd. * The `--help` option is now available when an unsupported cwd is in use. * The `--help` output now shows the same instructions about cwd as would be shown in error messages if the cwd is unsupported. * Add `--version` support to show the ansible-core version. * The explanation about cwd usage has been improved to explain more clearly what is required. Resolves ansible#64523 Resolves ansible#67551 (cherry picked from commit de5f60e)
Resolves ansible#62079 (cherry picked from commit 26b43f4)
(cherry picked from commit 18ed2c6)
* ansible-test - Clarify need for empty __init__.py * ansible-test - Update code-smell boilerplate. * Update code-smell boilerplate for core. * Update future boilerplate test for ansible-test. All ansible-test code (except for targets) and core-specific sanity tests now use the same boilerplate. The test also checks for unwanted `__future__` and `metaclass` boilerplate. * Relocate target tools to the correct directory. Several tools used on target Python versions were incorrectly placed in the controller directory. (cherry picked from commit d19b506)
Use of ``subprocess.MAXFD`` only worked on Python 2.x, which is no longer supported. (cherry picked from commit dc6b0d4)
* Remove unnecessary PyCharm ignores. * Ignore intentional undefined attribute usage. * Add missing type hints. Fix existing type hints. * Fix docstrings and comments. * Use function to register completion handler. * Pass strings to display functions. * Fix CompositeAction handling of dest argument. * Use consistent types in expressions/assignments. * Use custom function to keep linters happy. * Add missing raise for custom exception. * Clean up key/value type handling in cloud plugins. * Use dataclass instead of dict for results. * Add custom type_guard function to check lists. * Ignore return type that can't be checked (yet). * Avoid changing types on local variables. (cherry picked from commit a06fa49)
(cherry picked from commit af2b136)
(cherry picked from commit 7cb581e)
While getting hostname from container, podman command fails to return JSON so wrap exception and return hostname as 'None' Signed-off-by: Abhijeet Kasurde <akasurde@redhat.com> (cherry picked from commit 1100289)
Support can be restored once RHEL 9 has been released. (cherry picked from commit 55f90ba)
NOTE: This is a partial backport, including only one new class. (cherry picked from commit b960641)
* Run code-smell sanity tests in UTF-8 Mode. * Update subprocess use in sanity test programs. * Use raw_command instead of run_command with always=True set. * Add more capture=True usage. * Don't expose stdin to subprocesses. * Capture more output. Warn on retry. * Add more captures. * Capture coverage cli output. * Capture windows and network host checks. * Be explicit about interactive usage. * Use a shell for non-captured, non-interactive subprocesses. * Add integration test to assert no TTY. * Add unit test to assert no TTY. * Require blocking stdin/stdout/stderr. * Use subprocess.run in ansible-core sanity tests. * Remove unused arg. * Be explicit with subprocess.run check=False. * Add changelog. * Use a Python subprocess instead of a shell. * Use InternalError instead of Exception. * Require capture argument. * Check for invalid raw_command arguments. * Removed pointless communicate=True usage. * Relocate stdout w/o capture check. * Use threads instead of a subprocess for IO. (cherry picked from commit 5c2d830)
(cherry picked from commit 6513453)
(cherry picked from commit e2200e8)
(cherry picked from commit 2cc74b0)
* ansible-test - Add shell --export option. * ansible-test - Support cmd args for shell command. Also allow shell to be used without a valid layout if no delegation is required. * ansible-test - Improve stderr/stdout consistency. By default all output goes to stdout only, with the exception of a fatal error. When using any of the following, all output defaults to stderr instead: * sanity with the `--lint` option -- sanity messages to stdout * coverage analyze -- output to stdout if the output file is `/dev/stdout` * shell -- shell output to stdout This fixes issues two main issues: * Unpredictable output order when using both info and error/warning messages. * Mixing of lint/command/shell output with bootstrapping messages on stdout. * ansible-test - Add changelog fragment. (cherry picked from commit fe349a1)
The platform-specific and global fallbacks were not working with the `--remote` option. This regression was introduced by ansible#77711 (cherry picked from commit 76ead1e)
(cherry picked from commit f933314)
* Relocate update-ignore.py for easier re-use. * Add script to ease collection testing. * Skip ignore rewrite if file does not exist. * Add integration test for the shebang sanity test. * Fix ansible-test-no-tty integration test. Previously the test only verified a TTY was not used if a TTY already existed. This prevented the test from verifying behavior when run in CI. Now the test creates a PTY before invoking ansible-test. * Clean up ansible-test-docker integration test. (cherry picked from commit f70cc2f)
(cherry picked from commit a3c90dd)
(cherry picked from commit f2abfc4)
(cherry picked from commit 9901665)
- Allow disabled, unsupported, unstable and destructive integration test targets to be selected using their respective prefixes. - Allow unstable tests to run when targeted changes are made and the ``--allow-unstable-changed`` option is specified (resolves ansible#74213). (cherry picked from commit d3d7785)
…9538) * ansible-test - More flexible become support. (cherry picked from commit 5666c6d) * ansible-test - Add support for more remotes. (cherry picked from commit 24d91f5) * ansible-test - Enable ACLs on FreeBSD remotes. This allows integration tests to switch from one unprivileged user to another, sharing files between the users using ACLs. (cherry picked from commit b63812b) * ansible-test - Enable ACL support on more remotes. (ansible#78299) (cherry picked from commit 8bb20fe) * ansible-test - Install `acl` on Alpine remotes. (ansible#78303) (cherry picked from commit 8565dea) * ansible-test - Use sudo for all remotes. (ansible#78310) (cherry picked from commit f3f4ad9) * ansible-test - Fix Ubuntu 20.04 bootstrapping. (ansible#78551) (cherry picked from commit d683c5b) * ansible-test - Verify executables are executable. (ansible#78606) (cherry picked from commit ece85ab) * ansible-test - Use --tmpfs to run containers. (ansible#78605) (cherry picked from commit 4187707) * ansible-test - Remove Fedora 35 support. (ansible#78720) (cherry picked from commit 38a82a5) * ansible-test - Fix container error handling. (ansible#78739) (cherry picked from commit 79f67ed) * ansible-test - Improve container management. (ansible#78550) See changelogs/fragments/ansible-test-container-management.yml for details. (cherry picked from commit cda16cc) * ansible-test - Fix container detection. (ansible#79530) (cherry picked from commit 80d2f8d) * Update test matrix symlinks. (ansible#78737) * Add remote platform symlinks. These were already supported by ansible-test. This change adds the symlinks for use in the CI test matrix. * Remove obsolete AIX test symlink. AIX was already removed from ansible-test. (cherry picked from commit 62221a3) * Use patched containers without VOLUME instruction. * Make test suite compatible with older ansible. * Fix compatibility with Python 3.8. (cherry picked from commit 1d74369)
(cherry picked from commit 0a12d8a)
(cherry picked from commit dcc08ee)
* Remove unused code. * Fix explain errors. * Fix `--prime-containers` with docker on cgroup v2. (cherry picked from commit da3b1d3)
(cherry picked from commit 75b60b1)
(cherry picked from commit d658829)
(cherry picked from commit f6c0e22)
Also improve the ansible-test-container integration test: - Add coverage for the no-probe code path. - Add work-arounds for centos6 containers (to support backporting). - Avoid systemd debug when the container doesn't use cgroup. (cherry picked from commit 04fc98c)
A false positive is generated by the test and a fix was never backported to stable-2.12.
mattclay
force-pushed
the
at-container-management-2.12
branch
from
December 16, 2022 06:03
2c35dd4
to
b57b65f
Compare
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Labels
affects_2.12
backport
This PR does not target the devel branch.
feature
This issue/PR relates to a feature request.
needs_rebase
https://docs.ansible.com/ansible/devel/dev_guide/developing_rebasing.html
needs_revision
This PR fails CI tests or a maintainer has requested a review/revision of the PR.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
SUMMARY
Backports of the following:
acl
on Alpine remotes. #78303--prime-containers
and--explain
#79581ISSUE TYPE
Feature Pull Request
COMPONENT NAME
ansible-test