URL: https://github.com/freeipa/freeipa/pull/5068
Author: flo-renaud
 Title: #5068: [Backport][ipa-4-8] ipatests: run 
test_ipahealthcheck.py::TestIpaHealthCheck separately
Action: opened

PR body:
"""
This is a manual backport of PR #5066 to ipa-4-8 branch.
"""

To pull the PR as Git branch:
git remote add ghfreeipa https://github.com/freeipa/freeipa
git fetch ghfreeipa pull/5068/head:pr5068
git checkout pr5068
From 7280f43b4fc7b43dbd553949228d2c758fd1ce0d Mon Sep 17 00:00:00 2001
From: Florence Blanc-Renaud <f...@redhat.com>
Date: Fri, 28 Aug 2020 14:51:48 +0200
Subject: [PATCH 1/2] ipatests: run test_ipahealthcheck.py::TestIpaHealthCheck
 separately

The test is changing the date back and forth. Due to PRCI
infra issue, chronyd is not able to connect to the default
NTP servers from the fedora pool, and the date is not
synchronized any more after this test.

To avoid polluting other tests, run this one separately.

Fixes: https://pagure.io/freeipa/issue/8472
Signed-off-by: Florence Blanc-Renaud <f...@redhat.com>
---
 .../prci_definitions/nightly_ipa-4-8_latest.yaml | 16 ++++++++++++++--
 .../nightly_ipa-4-8_previous.yaml                | 16 ++++++++++++++--
 2 files changed, 28 insertions(+), 4 deletions(-)

diff --git a/ipatests/prci_definitions/nightly_ipa-4-8_latest.yaml b/ipatests/prci_definitions/nightly_ipa-4-8_latest.yaml
index 9a09514313..5e723c636a 100644
--- a/ipatests/prci_definitions/nightly_ipa-4-8_latest.yaml
+++ b/ipatests/prci_definitions/nightly_ipa-4-8_latest.yaml
@@ -1336,9 +1336,21 @@ jobs:
       class: RunPytest
       args:
         build_url: '{fedora-latest-ipa-4-8/build_url}'
-        test_suite: test_integration/test_ipahealthcheck.py::TestIpaHealthCheck test_integration/test_ipahealthcheck.py::TestIpaHealthCheckWithoutDNS test_integration/test_ipahealthcheck.py::TestIpaHealthCheckWithExternalCA
+        test_suite: test_integration/test_ipahealthcheck.py::TestIpaHealthCheck
         template: *ci-ipa-4-8-latest
-        timeout: 7200
+        timeout: 3600
+        topology: *master_1repl
+
+  fedora-latest-ipa-4-8/test_ipahealthcheck_nodns_extca:
+    requires: [fedora-latest-ipa-4-8/build]
+    priority: 50
+    job:
+      class: RunPytest
+      args:
+        build_url: '{fedora-latest-ipa-4-8/build_url}'
+        test_suite: test_integration/test_ipahealthcheck.py::TestIpaHealthCheckWithoutDNS test_integration/test_ipahealthcheck.py::TestIpaHealthCheckWithExternalCA
+        template: *ci-ipa-4-8-latest
+        timeout: 3600
         topology: *master_1repl
 
   fedora-latest-ipa-4-8/test_ipahealthcheck_trust:
diff --git a/ipatests/prci_definitions/nightly_ipa-4-8_previous.yaml b/ipatests/prci_definitions/nightly_ipa-4-8_previous.yaml
index 3294ff8256..3295d1061a 100644
--- a/ipatests/prci_definitions/nightly_ipa-4-8_previous.yaml
+++ b/ipatests/prci_definitions/nightly_ipa-4-8_previous.yaml
@@ -1336,9 +1336,21 @@ jobs:
       class: RunPytest
       args:
         build_url: '{fedora-previous-ipa-4-8/build_url}'
-        test_suite: test_integration/test_ipahealthcheck.py::TestIpaHealthCheck test_integration/test_ipahealthcheck.py::TestIpaHealthCheckWithoutDNS test_integration/test_ipahealthcheck.py::TestIpaHealthCheckWithExternalCA
+        test_suite: test_integration/test_ipahealthcheck.py::TestIpaHealthCheck
         template: *ci-ipa-4-8-previous
-        timeout: 7200
+        timeout: 3600
+        topology: *master_1repl
+
+  fedora-previous-ipa-4-8/test_ipahealthcheck_nodns_extca:
+    requires: [fedora-previous-ipa-4-8/build]
+    priority: 50
+    job:
+      class: RunPytest
+      args:
+        build_url: '{fedora-previous-ipa-4-8/build_url}'
+        test_suite: test_integration/test_ipahealthcheck.py::TestIpaHealthCheckWithoutDNS test_integration/test_ipahealthcheck.py::TestIpaHealthCheckWithExternalCA
+        template: *ci-ipa-4-8-previous
+        timeout: 3600
         topology: *master_1repl
 
   fedora-previous-ipa-4-8/test_ipahealthcheck_trust:

From 2abf00ec06886aa6eb2460ac5d2a239e7882a1df Mon Sep 17 00:00:00 2001
From: Florence Blanc-Renaud <f...@redhat.com>
Date: Fri, 28 Aug 2020 14:55:56 +0200
Subject: [PATCH 2/2] ipatests: add missing healthcheck test in PRCI nightlies

Signed-off-by: Florence Blanc-Renaud <f...@redhat.com>
---
 .../prci_definitions/nightly_ipa-4-8_latest.yaml | 16 ++++++++++++++--
 .../nightly_ipa-4-8_previous.yaml                | 16 ++++++++++++++--
 2 files changed, 28 insertions(+), 4 deletions(-)

diff --git a/ipatests/prci_definitions/nightly_ipa-4-8_latest.yaml b/ipatests/prci_definitions/nightly_ipa-4-8_latest.yaml
index 5e723c636a..c374ebc06d 100644
--- a/ipatests/prci_definitions/nightly_ipa-4-8_latest.yaml
+++ b/ipatests/prci_definitions/nightly_ipa-4-8_latest.yaml
@@ -1341,14 +1341,26 @@ jobs:
         timeout: 3600
         topology: *master_1repl
 
-  fedora-latest-ipa-4-8/test_ipahealthcheck_nodns_extca:
+  fedora-latest-ipa-4-8/test_ipahealthcheck_nodns_extca_file:
     requires: [fedora-latest-ipa-4-8/build]
     priority: 50
     job:
       class: RunPytest
       args:
         build_url: '{fedora-latest-ipa-4-8/build_url}'
-        test_suite: test_integration/test_ipahealthcheck.py::TestIpaHealthCheckWithoutDNS test_integration/test_ipahealthcheck.py::TestIpaHealthCheckWithExternalCA
+        test_suite: test_integration/test_ipahealthcheck.py::TestIpaHealthCheckWithoutDNS test_integration/test_ipahealthcheck.py::TestIpaHealthCheckWithExternalCA test_integration/test_ipahealthcheck.py::TestIpaHealthCheckFileCheck
+        template: *ci-ipa-4-8-latest
+        timeout: 5400
+        topology: *master_1repl
+
+  fedora-latest-ipa-4-8/test_ipahealthcheck_cli_fsspace:
+    requires: [fedora-latest-ipa-4-8/build]
+    priority: 50
+    job:
+      class: RunPytest
+      args:
+        build_url: '{fedora-latest-ipa-4-8/build_url}'
+        test_suite: test_integration/test_ipahealthcheck.py::TestIpaHealthCLI test_integration/test_ipahealthcheck.py::TestIpaHealthCheckFilesystemSpace
         template: *ci-ipa-4-8-latest
         timeout: 3600
         topology: *master_1repl
diff --git a/ipatests/prci_definitions/nightly_ipa-4-8_previous.yaml b/ipatests/prci_definitions/nightly_ipa-4-8_previous.yaml
index 3295d1061a..dcf802cf92 100644
--- a/ipatests/prci_definitions/nightly_ipa-4-8_previous.yaml
+++ b/ipatests/prci_definitions/nightly_ipa-4-8_previous.yaml
@@ -1341,14 +1341,26 @@ jobs:
         timeout: 3600
         topology: *master_1repl
 
-  fedora-previous-ipa-4-8/test_ipahealthcheck_nodns_extca:
+  fedora-previous-ipa-4-8/test_ipahealthcheck_nodns_extca_file:
     requires: [fedora-previous-ipa-4-8/build]
     priority: 50
     job:
       class: RunPytest
       args:
         build_url: '{fedora-previous-ipa-4-8/build_url}'
-        test_suite: test_integration/test_ipahealthcheck.py::TestIpaHealthCheckWithoutDNS test_integration/test_ipahealthcheck.py::TestIpaHealthCheckWithExternalCA
+        test_suite: test_integration/test_ipahealthcheck.py::TestIpaHealthCheckWithoutDNS test_integration/test_ipahealthcheck.py::TestIpaHealthCheckWithExternalCA test_integration/test_ipahealthcheck.py::TestIpaHealthCheckFileCheck
+        template: *ci-ipa-4-8-previous
+        timeout: 5400
+        topology: *master_1repl
+
+  fedora-previous-ipa-4-8/test_ipahealthcheck_cli_fsspace:
+    requires: [fedora-previous-ipa-4-8/build]
+    priority: 50
+    job:
+      class: RunPytest
+      args:
+        build_url: '{fedora-previous-ipa-4-8/build_url}'
+        test_suite: test_integration/test_ipahealthcheck.py::TestIpaHealthCLI test_integration/test_ipahealthcheck.py::TestIpaHealthCheckFilesystemSpace
         template: *ci-ipa-4-8-previous
         timeout: 3600
         topology: *master_1repl
_______________________________________________
FreeIPA-devel mailing list -- freeipa-devel@lists.fedorahosted.org
To unsubscribe send an email to freeipa-devel-le...@lists.fedorahosted.org
Fedora Code of Conduct: 
https://docs.fedoraproject.org/en-US/project/code-of-conduct/
List Guidelines: https://fedoraproject.org/wiki/Mailing_list_guidelines
List Archives: 
https://lists.fedorahosted.org/archives/list/freeipa-devel@lists.fedorahosted.org

Reply via email to