From 14e2f92974c52968f50a9b6132d94cf6f65b9e00 Mon Sep 17 00:00:00 2001
From: Felix Fontein <felix@fontein.de>
Date: Wed, 13 Mar 2024 13:56:22 +0100
Subject: [PATCH] Improve inventory integration tests. (#817)

---
 .../playbooks/docker_cleanup.yml                         | 9 ---------
 .../targets/inventory_docker_containers/runme.sh         | 8 ++++----
 .../targets/inventory_docker_machine/runme.sh            | 8 ++++----
 .../inventory_docker_swarm/playbooks/swarm_cleanup.yml   | 9 ---------
 .../integration/targets/inventory_docker_swarm/runme.sh  | 8 ++++----
 5 files changed, 12 insertions(+), 30 deletions(-)

diff --git a/tests/integration/targets/inventory_docker_containers/playbooks/docker_cleanup.yml b/tests/integration/targets/inventory_docker_containers/playbooks/docker_cleanup.yml
index 6f2a3b6c..9a01aa28 100644
--- a/tests/integration/targets/inventory_docker_containers/playbooks/docker_cleanup.yml
+++ b/tests/integration/targets/inventory_docker_containers/playbooks/docker_cleanup.yml
@@ -15,12 +15,3 @@
       loop:
         - ansible-docker-test-docker-inventory-container-1
         - ansible-docker-test-docker-inventory-container-2
-
-    - name: remove docker pagkages
-      action: "{{ ansible_facts.pkg_mgr }}"
-      args:
-        name:
-          - docker
-          - docker-ce
-          - docker-ce-cli
-        state: absent
diff --git a/tests/integration/targets/inventory_docker_containers/runme.sh b/tests/integration/targets/inventory_docker_containers/runme.sh
index acc1d5f4..012502cb 100755
--- a/tests/integration/targets/inventory_docker_containers/runme.sh
+++ b/tests/integration/targets/inventory_docker_containers/runme.sh
@@ -9,17 +9,17 @@ set -euo pipefail
 
 cleanup() {
     echo "Cleanup"
-    ansible-playbook playbooks/docker_cleanup.yml
+    ansible-playbook playbooks/docker_cleanup.yml "$@"
     echo "Done"
 }
 
 trap cleanup INT TERM EXIT
 
 echo "Setup"
-ANSIBLE_ROLES_PATH=.. ansible-playbook  playbooks/docker_setup.yml
+ANSIBLE_ROLES_PATH=.. ansible-playbook  playbooks/docker_setup.yml "$@"
 
 echo "Test docker_containers inventory 1"
-ansible-playbook -i inventory_1.docker.yml playbooks/test_inventory_1.yml
+ansible-playbook -i inventory_1.docker.yml playbooks/test_inventory_1.yml "$@"
 
 echo "Test docker_containers inventory 2"
-ansible-playbook -i inventory_2.docker.yml playbooks/test_inventory_2.yml
+ansible-playbook -i inventory_2.docker.yml playbooks/test_inventory_2.yml "$@"
diff --git a/tests/integration/targets/inventory_docker_machine/runme.sh b/tests/integration/targets/inventory_docker_machine/runme.sh
index b39a08c4..5d00aa66 100755
--- a/tests/integration/targets/inventory_docker_machine/runme.sh
+++ b/tests/integration/targets/inventory_docker_machine/runme.sh
@@ -23,14 +23,14 @@ SAVED_PATH="$PATH"
 cleanup() {
     PATH="${SAVED_PATH}"
     echo "Cleanup"
-    ansible-playbook -i teardown.docker_machine.yml playbooks/teardown.yml
+    ansible-playbook -i teardown.docker_machine.yml playbooks/teardown.yml "$@"
     echo "Done"
 }
 
 trap cleanup INT TERM EXIT
 
 echo "Pre-setup (install docker, docker-machine)"
-ANSIBLE_ROLES_PATH=.. ansible-playbook playbooks/pre-setup.yml
+ANSIBLE_ROLES_PATH=.. ansible-playbook playbooks/pre-setup.yml "$@"
 
 echo "Print docker-machine version"
 docker-machine --version
@@ -43,10 +43,10 @@ echo "Test that the docker_machine inventory plugin is being loaded"
 ANSIBLE_DEBUG=yes ansible-inventory -i inventory_1.docker_machine.yml --list | grep -F "Loading InventoryModule 'docker_machine'"
 
 echo "Setup"
-ansible-playbook playbooks/setup.yml
+ansible-playbook playbooks/setup.yml "$@"
 
 echo "Test docker_machine inventory 1"
-ansible-playbook -i inventory_1.docker_machine.yml playbooks/test_inventory_1.yml
+ansible-playbook -i inventory_1.docker_machine.yml playbooks/test_inventory_1.yml "$@"
 
 echo "Activate Docker Machine mock"
 PATH=${SCRIPT_DIR}:$PATH
diff --git a/tests/integration/targets/inventory_docker_swarm/playbooks/swarm_cleanup.yml b/tests/integration/targets/inventory_docker_swarm/playbooks/swarm_cleanup.yml
index 4039a6bd..a6bedd41 100644
--- a/tests/integration/targets/inventory_docker_swarm/playbooks/swarm_cleanup.yml
+++ b/tests/integration/targets/inventory_docker_swarm/playbooks/swarm_cleanup.yml
@@ -11,12 +11,3 @@
       docker_swarm:
         state: absent
         force: true
-
-    - name: remove docker pagkages
-      action: "{{ ansible_facts.pkg_mgr }}"
-      args:
-        name:
-          - docker
-          - docker-ce
-          - docker-ce-cli
-        state: absent
diff --git a/tests/integration/targets/inventory_docker_swarm/runme.sh b/tests/integration/targets/inventory_docker_swarm/runme.sh
index 746b8592..1759b888 100755
--- a/tests/integration/targets/inventory_docker_swarm/runme.sh
+++ b/tests/integration/targets/inventory_docker_swarm/runme.sh
@@ -9,17 +9,17 @@ set -euo pipefail
 
 cleanup() {
     echo "Cleanup"
-    ansible-playbook playbooks/swarm_cleanup.yml
+    ansible-playbook playbooks/swarm_cleanup.yml "$@"
     echo "Done"
 }
 
 trap cleanup INT TERM EXIT
 
 echo "Setup"
-ANSIBLE_ROLES_PATH=.. ansible-playbook  playbooks/swarm_setup.yml
+ANSIBLE_ROLES_PATH=.. ansible-playbook  playbooks/swarm_setup.yml "$@"
 
 echo "Test docker_swarm inventory 1"
-ansible-playbook -i inventory_1.docker_swarm.yml playbooks/test_inventory_1.yml
+ansible-playbook -i inventory_1.docker_swarm.yml playbooks/test_inventory_1.yml "$@"
 
 echo "Test docker_swarm inventory 2"
-ansible-playbook -i inventory_2.docker_swarm.yml playbooks/test_inventory_2.yml
+ansible-playbook -i inventory_2.docker_swarm.yml playbooks/test_inventory_2.yml "$@"