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.
2 years ago · 3a891827b7
parent bab315b780
commit 3a891827b7
38 changed files with 3 additions and 72 deletions
--- a/changelogs/fragments/ansible-test-remove-aix-provisioning.yaml
+++ b/changelogs/fragments/ansible-test-remove-aix-provisioning.yaml
@ -0,0 +1,2 @@
+minor_changes:
+  - ansible-test - Remove support for provisioning remote AIX instances.
--- a/test/integration/targets/ansiballz_python/aliases
+++ b/test/integration/targets/ansiballz_python/aliases
@ -1,3 +1,2 @@
 shippable/posix/group1
-skip/aix
 context/target
--- a/test/integration/targets/apt/aliases
+++ b/test/integration/targets/apt/aliases
@ -4,4 +4,3 @@ skip/freebsd
 skip/osx
 skip/macos
 skip/rhel
-skip/aix
--- a/test/integration/targets/apt_key/aliases
+++ b/test/integration/targets/apt_key/aliases
@ -3,4 +3,3 @@ skip/freebsd
 skip/osx
 skip/macos
 skip/rhel
-skip/aix
--- a/test/integration/targets/apt_repository/aliases
+++ b/test/integration/targets/apt_repository/aliases
@ -4,4 +4,3 @@ skip/freebsd
 skip/osx
 skip/macos
 skip/rhel
-skip/aix
--- a/test/integration/targets/async/aliases
+++ b/test/integration/targets/async/aliases
@ -1,4 +1,3 @@
 async_status
 async_wrapper
 shippable/posix/group2
-skip/aix
--- a/test/integration/targets/become/aliases
+++ b/test/integration/targets/become/aliases
@ -1,4 +1,3 @@
 destructive
 shippable/posix/group1
-skip/aix
 context/target
--- a/test/integration/targets/binary_modules/Makefile
+++ b/test/integration/targets/binary_modules/Makefile
@ -7,7 +7,6 @@ all:
 	cd library; \
 	GOOS=linux   GOARCH=amd64   go build -o helloworld_linux_x86_64       helloworld.go; \
 	GOOS=linux   GOARCH=ppc64le go build -o helloworld_linux_ppc64le      helloworld.go; \
-	GOOS=aix     GOARCH=ppc64   go build -o helloworld_aix_chrp           helloworld.go; \
 	GOOS=windows GOARCH=amd64   go build -o helloworld_win32nt_64-bit.exe helloworld.go; \
 	GOOS=darwin  GOARCH=amd64   go build -o helloworld_darwin_x86_64      helloworld.go; \
 	GOOS=freebsd GOARCH=amd64   go build -o helloworld_freebsd_amd64      helloworld.go
--- a/test/integration/targets/command_shell/aliases
+++ b/test/integration/targets/command_shell/aliases
@ -1,4 +1,3 @@
 command
 shippable/posix/group2
 shell
-skip/aix
--- a/test/integration/targets/copy/aliases
+++ b/test/integration/targets/copy/aliases
@ -1,4 +1,3 @@
 needs/root
 shippable/posix/group2
 destructive
-skip/aix
--- a/test/integration/targets/cron/aliases
+++ b/test/integration/targets/cron/aliases
@ -1,5 +1,4 @@
 destructive
 shippable/posix/group4
-skip/aix
 skip/osx
 skip/macos
--- a/test/integration/targets/debconf/aliases
+++ b/test/integration/targets/debconf/aliases
@ -1,2 +1 @@
 shippable/posix/group1
-skip/aix
--- a/test/integration/targets/dnf/aliases
+++ b/test/integration/targets/dnf/aliases
@ -1,6 +1,5 @@
 destructive
 shippable/posix/group4
-skip/aix
 skip/power/centos
 skip/freebsd
 skip/osx
--- a/test/integration/targets/dpkg_selections/aliases
+++ b/test/integration/targets/dpkg_selections/aliases
@ -1,6 +1,5 @@
 shippable/posix/group1
 destructive
-skip/aix
 skip/freebsd
 skip/osx
 skip/macos
--- a/test/integration/targets/file/aliases
+++ b/test/integration/targets/file/aliases
@ -1,3 +1,2 @@
 shippable/posix/group2
 needs/root
-skip/aix
--- a/test/integration/targets/get_url/aliases
+++ b/test/integration/targets/get_url/aliases
@ -1,4 +1,3 @@
 destructive
 shippable/posix/group1
 needs/httptester
-skip/aix
--- a/test/integration/targets/getent/aliases
+++ b/test/integration/targets/getent/aliases
@ -1,2 +1 @@
 shippable/posix/group1
-skip/aix
--- a/test/integration/targets/git/aliases
+++ b/test/integration/targets/git/aliases
@ -1,2 +1 @@
 shippable/posix/group4
-skip/aix
--- a/test/integration/targets/group/aliases
+++ b/test/integration/targets/group/aliases
@ -1,2 +1 @@
 shippable/posix/group1
-skip/aix
--- a/test/integration/targets/hostname/aliases
+++ b/test/integration/targets/hostname/aliases
@ -1,3 +1,2 @@
 shippable/posix/group1
 destructive
-skip/aix  # currently unsupported by hostname module
--- a/test/integration/targets/package/aliases
+++ b/test/integration/targets/package/aliases
@ -1,3 +1,2 @@
 shippable/posix/group1
 destructive
-skip/aix
--- a/test/integration/targets/package_facts/aliases
+++ b/test/integration/targets/package_facts/aliases
@ -1,4 +1,3 @@
 shippable/posix/group3
-skip/aix
 skip/osx
 skip/macos
--- a/test/integration/targets/pip/aliases
+++ b/test/integration/targets/pip/aliases
@ -1,3 +1,2 @@
 destructive
 shippable/posix/group5
-skip/aix
--- a/test/integration/targets/remote_tmp/aliases
+++ b/test/integration/targets/remote_tmp/aliases
@ -1,4 +1,3 @@
 shippable/posix/group3
-skip/aix
 context/target
 needs/target/setup_remote_tmp_dir
--- a/test/integration/targets/rpm_key/aliases
+++ b/test/integration/targets/rpm_key/aliases
@ -1,3 +1,2 @@
 destructive
 shippable/posix/group1
-skip/aix
--- a/test/integration/targets/service/aliases
+++ b/test/integration/targets/service/aliases
@ -1,5 +1,4 @@
 destructive
 shippable/posix/group1
-skip/aix
 skip/osx
 skip/macos
--- a/test/integration/targets/service_facts/aliases
+++ b/test/integration/targets/service_facts/aliases
@ -1,5 +1,4 @@
 shippable/posix/group3
-skip/aix
 skip/freebsd
 skip/osx
 skip/macos
--- a/test/integration/targets/subversion/aliases
+++ b/test/integration/targets/subversion/aliases
@ -1,6 +1,5 @@
 setup/always/setup_passlib
 shippable/posix/group2
-skip/aix
 skip/osx
 skip/macos
 skip/rhel/9.0b  # svn checkout hangs
--- a/test/integration/targets/systemd/aliases
+++ b/test/integration/targets/systemd/aliases
@ -1,2 +1 @@
 shippable/posix/group1
-skip/aix
--- a/test/integration/targets/unarchive/aliases
+++ b/test/integration/targets/unarchive/aliases
@ -1,4 +1,3 @@
 needs/root
 shippable/posix/group2
 destructive
-skip/aix
--- a/test/integration/targets/unsafe_writes/aliases
+++ b/test/integration/targets/unsafe_writes/aliases
@ -3,6 +3,5 @@ needs/root
 skip/freebsd
 skip/osx
 skip/macos
-skip/aix
 shippable/posix/group3
 needs/target/setup_remote_tmp_dir
--- a/test/integration/targets/uri/aliases
+++ b/test/integration/targets/uri/aliases
@ -1,4 +1,3 @@
 destructive
 shippable/posix/group4
 needs/httptester
-skip/aix
--- a/test/integration/targets/user/aliases
+++ b/test/integration/targets/user/aliases
@ -1,3 +1,2 @@
 destructive
 shippable/posix/group1
-skip/aix
--- a/test/integration/targets/yum/aliases
+++ b/test/integration/targets/yum/aliases
@ -1,6 +1,5 @@
 destructive
 shippable/posix/group4
-skip/aix
 skip/freebsd
 skip/osx
 skip/macos
--- a/test/integration/targets/yum_repository/aliases
+++ b/test/integration/targets/yum_repository/aliases
@ -1,3 +1,2 @@
 shippable/posix/group1
 destructive
-skip/aix
--- 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
--- 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)]
--- 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 ;;