From 754c54d3d6fb4346ed2c47db1f9757bd6ccfb473 Mon Sep 17 00:00:00 2001 From: Matt Clay Date: Fri, 16 Dec 2022 17:24:27 -0800 Subject: [PATCH] Clean up setup_paramiko test target. - Remove obsolete install/uninstall files. - Use OS packages on Alpine 3. --- .../targets/setup_paramiko/install-Alpine-3-python-3.yml | 9 +-------- .../targets/setup_paramiko/install-CentOS-6-python-2.yml | 3 --- .../setup_paramiko/install-Fedora-35-python-3.yml | 9 --------- .../setup_paramiko/install-Ubuntu-16-python-2.yml | 3 --- .../targets/setup_paramiko/install-python-2.yml | 3 --- .../setup_paramiko/uninstall-Alpine-3-python-3.yml | 4 +--- .../setup_paramiko/uninstall-Fedora-35-python-3.yml | 5 ----- .../targets/setup_paramiko/uninstall-apt-python-2.yml | 5 ----- .../targets/setup_paramiko/uninstall-zypper-python-2.yml | 2 -- 9 files changed, 2 insertions(+), 41 deletions(-) delete mode 100644 test/integration/targets/setup_paramiko/install-CentOS-6-python-2.yml delete mode 100644 test/integration/targets/setup_paramiko/install-Fedora-35-python-3.yml delete mode 100644 test/integration/targets/setup_paramiko/install-Ubuntu-16-python-2.yml delete mode 100644 test/integration/targets/setup_paramiko/install-python-2.yml delete mode 100644 test/integration/targets/setup_paramiko/uninstall-Fedora-35-python-3.yml delete mode 100644 test/integration/targets/setup_paramiko/uninstall-apt-python-2.yml delete mode 100644 test/integration/targets/setup_paramiko/uninstall-zypper-python-2.yml diff --git a/test/integration/targets/setup_paramiko/install-Alpine-3-python-3.yml b/test/integration/targets/setup_paramiko/install-Alpine-3-python-3.yml index f16d9b53115..8c0b28bf263 100644 --- a/test/integration/targets/setup_paramiko/install-Alpine-3-python-3.yml +++ b/test/integration/targets/setup_paramiko/install-Alpine-3-python-3.yml @@ -1,9 +1,2 @@ -- name: Setup remote constraints - include_tasks: setup-remote-constraints.yml - name: Install Paramiko for Python 3 on Alpine - pip: # no apk package manager in core, just use pip - name: paramiko - extra_args: "-c {{ remote_constraints }}" - environment: - # Not sure why this fixes the test, but it does. - SETUPTOOLS_USE_DISTUTILS: stdlib + command: apk add py3-paramiko diff --git a/test/integration/targets/setup_paramiko/install-CentOS-6-python-2.yml b/test/integration/targets/setup_paramiko/install-CentOS-6-python-2.yml deleted file mode 100644 index 0c7b9e82fde..00000000000 --- a/test/integration/targets/setup_paramiko/install-CentOS-6-python-2.yml +++ /dev/null @@ -1,3 +0,0 @@ -- name: Install Paramiko for Python 2 on CentOS 6 - yum: - name: python-paramiko diff --git a/test/integration/targets/setup_paramiko/install-Fedora-35-python-3.yml b/test/integration/targets/setup_paramiko/install-Fedora-35-python-3.yml deleted file mode 100644 index bbe97a96392..00000000000 --- a/test/integration/targets/setup_paramiko/install-Fedora-35-python-3.yml +++ /dev/null @@ -1,9 +0,0 @@ -- name: Install Paramiko and crypto policies scripts - dnf: - name: - - crypto-policies-scripts - - python3-paramiko - install_weak_deps: no - -- name: Drop the crypto-policy to LEGACY for these tests - command: update-crypto-policies --set LEGACY diff --git a/test/integration/targets/setup_paramiko/install-Ubuntu-16-python-2.yml b/test/integration/targets/setup_paramiko/install-Ubuntu-16-python-2.yml deleted file mode 100644 index 8f760740077..00000000000 --- a/test/integration/targets/setup_paramiko/install-Ubuntu-16-python-2.yml +++ /dev/null @@ -1,3 +0,0 @@ -- name: Install Paramiko for Python 2 on Ubuntu 16 - apt: - name: python-paramiko diff --git a/test/integration/targets/setup_paramiko/install-python-2.yml b/test/integration/targets/setup_paramiko/install-python-2.yml deleted file mode 100644 index be337a1693c..00000000000 --- a/test/integration/targets/setup_paramiko/install-python-2.yml +++ /dev/null @@ -1,3 +0,0 @@ -- name: Install Paramiko for Python 2 - package: - name: python2-paramiko diff --git a/test/integration/targets/setup_paramiko/uninstall-Alpine-3-python-3.yml b/test/integration/targets/setup_paramiko/uninstall-Alpine-3-python-3.yml index e9dcc62c688..edb504ff664 100644 --- a/test/integration/targets/setup_paramiko/uninstall-Alpine-3-python-3.yml +++ b/test/integration/targets/setup_paramiko/uninstall-Alpine-3-python-3.yml @@ -1,4 +1,2 @@ - name: Uninstall Paramiko for Python 3 on Alpine - pip: - name: paramiko - state: absent + command: apk del py3-paramiko diff --git a/test/integration/targets/setup_paramiko/uninstall-Fedora-35-python-3.yml b/test/integration/targets/setup_paramiko/uninstall-Fedora-35-python-3.yml deleted file mode 100644 index 6d0e9a199dc..00000000000 --- a/test/integration/targets/setup_paramiko/uninstall-Fedora-35-python-3.yml +++ /dev/null @@ -1,5 +0,0 @@ -- name: Revert the crypto-policy back to DEFAULT - command: update-crypto-policies --set DEFAULT - -- name: Uninstall Paramiko and crypto policies scripts using dnf history undo - command: dnf history undo last --assumeyes diff --git a/test/integration/targets/setup_paramiko/uninstall-apt-python-2.yml b/test/integration/targets/setup_paramiko/uninstall-apt-python-2.yml deleted file mode 100644 index 507d94cc3bb..00000000000 --- a/test/integration/targets/setup_paramiko/uninstall-apt-python-2.yml +++ /dev/null @@ -1,5 +0,0 @@ -- name: Uninstall Paramiko for Python 2 using apt - apt: - name: python-paramiko - state: absent - autoremove: yes diff --git a/test/integration/targets/setup_paramiko/uninstall-zypper-python-2.yml b/test/integration/targets/setup_paramiko/uninstall-zypper-python-2.yml deleted file mode 100644 index adb26e5c285..00000000000 --- a/test/integration/targets/setup_paramiko/uninstall-zypper-python-2.yml +++ /dev/null @@ -1,2 +0,0 @@ -- name: Uninstall Paramiko for Python 2 using zypper - command: zypper --quiet --non-interactive remove --clean-deps python2-paramiko