diff options
| author | Matt Clay <mclay@redhat.com> | 2022-01-12 23:27:05 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-01-12 23:27:05 +0100 |
| commit | 3a891827b71fd91fe39f7821ebc3235ba4044f48 (patch) | |
| tree | 241d3a4d39de51c968a56a4d90dee63a4b3858f7 /test/lib/ansible_test | |
| parent | ansible-test - Add support for FreeBSD 12.3. (#76745) (diff) | |
| download | ansible-3a891827b71fd91fe39f7821ebc3235ba4044f48.tar.xz ansible-3a891827b71fd91fe39f7821ebc3235ba4044f48.zip | |
ansible-test - Remove AIX provisioning support. (#76747)
* ansible-test - Remove AIX provisioning support.
* Remove `skip/aix` integration test aliases.
* Remove build for AIX binary module.
Diffstat (limited to 'test/lib/ansible_test')
| -rw-r--r-- | test/lib/ansible_test/_data/completion/remote.txt | 2 | ||||
| -rw-r--r-- | test/lib/ansible_test/_internal/connections.py | 6 | ||||
| -rw-r--r-- | test/lib/ansible_test/_util/target/setup/bootstrap.sh | 31 |
3 files changed, 1 insertions, 38 deletions
diff --git a/test/lib/ansible_test/_data/completion/remote.txt b/test/lib/ansible_test/_data/completion/remote.txt index 02ee9a66e4..f9903849e9 100644 --- a/test/lib/ansible_test/_data/completion/remote.txt +++ b/test/lib/ansible_test/_data/completion/remote.txt @@ -9,5 +9,3 @@ rhel/7.9 python=2.7 provider=aws rhel/8.5 python=3.6,3.8,3.9 provider=aws rhel/9.0b python=3.9 provider=aws rhel provider=aws -aix/7.2 python=2.7,3.7 python_dir=/opt/freeware/bin provider=ibmps -aix python_dir=/opt/freeware/bin provider=ibmps diff --git a/test/lib/ansible_test/_internal/connections.py b/test/lib/ansible_test/_internal/connections.py index ddf4e8df38..14234b2d93 100644 --- a/test/lib/ansible_test/_internal/connections.py +++ b/test/lib/ansible_test/_internal/connections.py @@ -58,8 +58,6 @@ class Connection(metaclass=abc.ABCMeta): src, # type: t.IO[bytes] ): """Extract the given archive file stream in the specified directory.""" - # This will not work on AIX. - # However, AIX isn't supported as a controller, which is where this would be needed. tar_cmd = ['tar', 'oxzf', '-', '-C', chdir] retry(lambda: self.run(tar_cmd, stdin=src)) @@ -75,13 +73,11 @@ class Connection(metaclass=abc.ABCMeta): gzip_cmd = ['gzip'] if exclude: - # This will not work on AIX. - # However, AIX isn't supported as a controller, which is where this would be needed. tar_cmd += ['--exclude', exclude] tar_cmd.append(name) - # Using gzip to compress the archive allows this to work on all POSIX systems we support, including AIX. + # Using gzip to compress the archive allows this to work on all POSIX systems we support. commands = [tar_cmd, gzip_cmd] sh_cmd = ['sh', '-c', ' | '.join(' '.join(shlex.quote(cmd) for cmd in command) for command in commands)] diff --git a/test/lib/ansible_test/_util/target/setup/bootstrap.sh b/test/lib/ansible_test/_util/target/setup/bootstrap.sh index 95fcac6181..94402b5af4 100644 --- a/test/lib/ansible_test/_util/target/setup/bootstrap.sh +++ b/test/lib/ansible_test/_util/target/setup/bootstrap.sh @@ -77,36 +77,6 @@ pip_install() { done } -bootstrap_remote_aix() -{ - chfs -a size=1G / - chfs -a size=4G /usr - chfs -a size=1G /var - chfs -a size=1G /tmp - chfs -a size=2G /opt - - if [ "${python_version}" = "2.7" ]; then - python_package_version="" - else - python_package_version="3" - fi - - packages=" - gcc - python${python_package_version} - python${python_package_version}-devel - python${python_package_version}-pip - " - - while true; do - # shellcheck disable=SC2086 - yum install -q -y ${packages} \ - && break - echo "Failed to install packages. Sleeping before trying again..." - sleep 10 - done -} - bootstrap_remote_freebsd() { if [ "${python_version}" = "2.7" ]; then @@ -321,7 +291,6 @@ bootstrap_remote() python_package_version="$(echo "${python_version}" | tr -d '.')" case "${platform}" in - "aix") bootstrap_remote_aix ;; "freebsd") bootstrap_remote_freebsd ;; "macos") bootstrap_remote_macos ;; "rhel") bootstrap_remote_rhel ;; |