From 11a9556169b4a4ad662a2d80c6067a3bd4d03c03 Mon Sep 17 00:00:00 2001
From: Mohammad Rizwan <myusuf@redhat.com>
Date: Fri, 29 Jan 2021 12:59:25 +0530
Subject: [PATCH 1/3] Revert "ipatests: Test if server setup without dns
 uninstall properly"

This reverts commit 69d480003bc6a7c75280c3c1a5e30cd252edcaec.

this test will be moved to existing test_uninstallation.py file
---
 ipatests/test_integration/test_uninstall.py | 27 ---------------------
 1 file changed, 27 deletions(-)
 delete mode 100644 ipatests/test_integration/test_uninstall.py

diff --git a/ipatests/test_integration/test_uninstall.py b/ipatests/test_integration/test_uninstall.py
deleted file mode 100644
index 3d065646820..00000000000
--- a/ipatests/test_integration/test_uninstall.py
+++ /dev/null
@@ -1,27 +0,0 @@
-#
-# Copyright (C) 2020  FreeIPA Contributors see COPYING for license
-#
-
-"""
-Module for ipa uninstall related scenarios.
-"""
-
-from ipatests.pytest_ipa.integration import tasks
-from ipatests.test_integration.base import IntegrationTest
-
-
-class TestUninstallWithoutDNS(IntegrationTest):
-
-    @classmethod
-    def install(cls, mh):
-        tasks.install_master(cls.master, setup_dns=False)
-
-    def test_uninstall_server_without_dns(self):
-        """Test if server setup without dns uninstall properly
-
-        IPA server uninstall was failing if dns was not setup.
-        This test check if it uninstalls propelry.
-
-        related: https://pagure.io/freeipa/issue/8630
-        """
-        tasks.uninstall_master(self.master)

From e975529840a9038c89d8bf100c4bda72b78072fc Mon Sep 17 00:00:00 2001
From: Mohammad Rizwan <myusuf@redhat.com>
Date: Fri, 29 Jan 2021 13:00:10 +0530
Subject: [PATCH 2/3] Revert "ipatests: Add test_uninstall.py to nightly
 definitions"

This reverts commit 74b4d7e4df3b5406bc62ed1663318430e1739d1c.
---
 ipatests/prci_definitions/nightly_latest.yaml      | 12 ------------
 .../prci_definitions/nightly_latest_selinux.yaml   | 13 -------------
 .../prci_definitions/nightly_latest_testing.yaml   | 13 -------------
 .../nightly_latest_testing_selinux.yaml            | 14 --------------
 ipatests/prci_definitions/nightly_previous.yaml    | 12 ------------
 ipatests/prci_definitions/nightly_rawhide.yaml     | 13 -------------
 6 files changed, 77 deletions(-)

diff --git a/ipatests/prci_definitions/nightly_latest.yaml b/ipatests/prci_definitions/nightly_latest.yaml
index 7fbd32e4e9a..47d05df4ab7 100644
--- a/ipatests/prci_definitions/nightly_latest.yaml
+++ b/ipatests/prci_definitions/nightly_latest.yaml
@@ -1677,15 +1677,3 @@ jobs:
         template: *ci-master-latest
         timeout: 3600
         topology: *master_1repl
-
-  fedora-latest/test_uninstall:
-    requires: [fedora-latest/build]
-    priority: 50
-    job:
-      class: RunPytest
-      args:
-        build_url: '{fedora-latest/build_url}'
-        test_suite: test_integration/test_uninstall.py
-        template: *ci-master-latest
-        timeout: 3600
-        topology: *master_1repl
diff --git a/ipatests/prci_definitions/nightly_latest_selinux.yaml b/ipatests/prci_definitions/nightly_latest_selinux.yaml
index 92e2105cc18..c0ef168e399 100644
--- a/ipatests/prci_definitions/nightly_latest_selinux.yaml
+++ b/ipatests/prci_definitions/nightly_latest_selinux.yaml
@@ -1810,16 +1810,3 @@ jobs:
         template: *ci-master-latest
         timeout: 3600
         topology: *master_1repl
-
-  fedora-latest/test_uninstall:
-    requires: [fedora-latest/build]
-    priority: 50
-    job:
-      class: RunPytest
-      args:
-        build_url: '{fedora-latest/build_url}'
-        selinux_enforcing: True
-        test_suite: test_integration/test_uninstall.py
-        template: *ci-master-latest
-        timeout: 3600
-        topology: *master_1repl
diff --git a/ipatests/prci_definitions/nightly_latest_testing.yaml b/ipatests/prci_definitions/nightly_latest_testing.yaml
index 6c985c40aa6..0e722c259a8 100644
--- a/ipatests/prci_definitions/nightly_latest_testing.yaml
+++ b/ipatests/prci_definitions/nightly_latest_testing.yaml
@@ -1810,16 +1810,3 @@ jobs:
         template: *testing-master-latest
         timeout: 3600
         topology: *master_1repl
-
-  testing-fedora/test_uninstall:
-    requires: [testing-fedora/build]
-    priority: 50
-    job:
-      class: RunPytest
-      args:
-        build_url: '{testing-fedora/build_url}'
-        update_packages: True
-        test_suite: test_integration/test_uninstall.py
-        template: *testing-master-latest
-        timeout: 3600
-        topology: *master_1repl
diff --git a/ipatests/prci_definitions/nightly_latest_testing_selinux.yaml b/ipatests/prci_definitions/nightly_latest_testing_selinux.yaml
index 4ca0e6a3911..447d33623a5 100644
--- a/ipatests/prci_definitions/nightly_latest_testing_selinux.yaml
+++ b/ipatests/prci_definitions/nightly_latest_testing_selinux.yaml
@@ -1943,17 +1943,3 @@ jobs:
         template: *testing-master-latest
         timeout: 3600
         topology: *master_1repl
-
-  testing-fedora/test_uninstall:
-    requires: [testing-fedora/build]
-    priority: 50
-    job:
-      class: RunPytest
-      args:
-        build_url: '{testing-fedora/build_url}'
-        update_packages: True
-        selinux_enforcing: True
-        test_suite: test_integration/test_uninstall.py
-        template: *testing-master-latest
-        timeout: 3600
-        topology: *master_1repl
diff --git a/ipatests/prci_definitions/nightly_previous.yaml b/ipatests/prci_definitions/nightly_previous.yaml
index 58882a92c46..f6c972adb57 100644
--- a/ipatests/prci_definitions/nightly_previous.yaml
+++ b/ipatests/prci_definitions/nightly_previous.yaml
@@ -1665,15 +1665,3 @@ jobs:
         template: *ci-master-previous
         timeout: 3600
         topology: *master_1repl
-
-  fedora-previous/test_uninstall:
-    requires: [fedora-previous/build]
-    priority: 50
-    job:
-      class: RunPytest
-      args:
-        build_url: '{fedora-previous/build_url}'
-        test_suite: test_integration/test_uninstall.py
-        template: *ci-master-previous
-        timeout: 3600
-        topology: *master_1repl
diff --git a/ipatests/prci_definitions/nightly_rawhide.yaml b/ipatests/prci_definitions/nightly_rawhide.yaml
index 0d98367060b..d29fc92896c 100644
--- a/ipatests/prci_definitions/nightly_rawhide.yaml
+++ b/ipatests/prci_definitions/nightly_rawhide.yaml
@@ -1809,16 +1809,3 @@ jobs:
         template: *ci-master-frawhide
         timeout: 3600
         topology: *master_1repl
-
-  fedora-rawhide/test_uninstall:
-    requires: [fedora-rawhide/build]
-    priority: 50
-    job:
-      class: RunPytest
-      args:
-        build_url: '{fedora-rawhide/build_url}'
-        update_packages: True
-        test_suite: test_integration/test_uninstall.py
-        template: *ci-master-frawhide
-        timeout: 3600
-        topology: *master_1repl

From bf9f164c9956e8be1bb52975dfac2be19512d42a Mon Sep 17 00:00:00 2001
From: Mohammad Rizwan <myusuf@redhat.com>
Date: Fri, 29 Jan 2021 13:01:46 +0530
Subject: [PATCH 3/3] ipatests: Test if server setup without dns uninstall
 properly

IPA server uninstall was failing if dns was not setup.
This test check if it uninstalls propelry.

related: https://pagure.io/freeipa/issue/8630

Signed-off-by: Mohammad Rizwan <myusuf@redhat.com>
---
 .../test_integration/test_uninstallation.py     | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/ipatests/test_integration/test_uninstallation.py b/ipatests/test_integration/test_uninstallation.py
index a5cee142859..b65c11da5da 100644
--- a/ipatests/test_integration/test_uninstallation.py
+++ b/ipatests/test_integration/test_uninstallation.py
@@ -119,3 +119,20 @@ def test_failed_uninstall(self):
             self.master.run_command([
                 paths.DSCTL, serverid, 'remove', '--do-it'
             ])
+
+
+class TestUninstallWithoutDNS(IntegrationTest):
+
+    @classmethod
+    def install(cls, mh):
+        tasks.install_master(cls.master, setup_dns=False)
+
+    def test_uninstall_server_without_dns(self):
+        """Test if server setup without dns uninstall properly
+
+        IPA server uninstall was failing if dns was not setup.
+        This test check if it uninstalls propelry.
+
+        related: https://pagure.io/freeipa/issue/8630
+        """
+        tasks.uninstall_master(self.master)
