From aa1ae85b55c8b407e100a6485d54a0edec3a75cb Mon Sep 17 00:00:00 2001
From: "patchback[bot]" <45432694+patchback[bot]@users.noreply.github.com>
Date: Fri, 28 Jul 2023 20:19:29 +0200
Subject: [PATCH] [PR #7022/5d7899b3 backport][stable-6] setup_docker: handlers
 to stop service and remove requests (#7023)

setup_docker: handlers to stop service and remove requests (#7022)

(cherry picked from commit 5d7899b3410150dd47b6741a2d877313b0d4c267)

Co-authored-by: Alexei Znamensky <103110+russoz@users.noreply.github.com>
---
 .../targets/setup_docker/handlers/main.yml     | 18 +++++++++++++++---
 .../targets/setup_docker/tasks/main.yml        |  2 ++
 2 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/tests/integration/targets/setup_docker/handlers/main.yml b/tests/integration/targets/setup_docker/handlers/main.yml
index 2834967141..52e13e3c49 100644
--- a/tests/integration/targets/setup_docker/handlers/main.yml
+++ b/tests/integration/targets/setup_docker/handlers/main.yml
@@ -3,17 +3,29 @@
 # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt)
 # SPDX-License-Identifier: GPL-3.0-or-later
 
+- name: Remove python requests
+  ansible.builtin.pip:
+    name:
+      - requests
+    state: absent
+
+- name: Stop docker service
+  become: true
+  ansible.builtin.service:
+    name: docker
+    state: stopped
+
 - name: Remove Docker packages
-  package:
+  ansible.builtin.package:
     name: "{{ docker_packages }}"
     state: absent
 
 - name: "D-Fedora : Remove repository"
-  file:
+  ansible.builtin.file:
     path: /etc/yum.repos.d/docker-ce.repo
     state: absent
 
 - name: "D-Fedora : Remove dnf-plugins-core"
-  package:
+  ansible.builtin.package:
     name: dnf-plugins-core
     state: absent
diff --git a/tests/integration/targets/setup_docker/tasks/main.yml b/tests/integration/targets/setup_docker/tasks/main.yml
index 4f41da31a8..19bc7aa8c3 100644
--- a/tests/integration/targets/setup_docker/tasks/main.yml
+++ b/tests/integration/targets/setup_docker/tasks/main.yml
@@ -41,6 +41,7 @@
   ansible.builtin.service:
     name: docker
     state: started
+  notify: Stop docker service
 
 - name: Cheat on the docker socket permissions
   become: true
@@ -53,3 +54,4 @@
     name:
       - requests
     state: present
+  notify: Remove python requests