On 19.07.2016 17:05, Martin Basti wrote:
On 19.07.2016 16:18, Martin Basti wrote:
Patch attached.
self-NACK, my assumptions were wrong, this doesn't work if any of log
files do not exist
updated patches attached
Please note, that in case that any logfile does not exist tar returns
exit code 2, but provides correct output anyway.
From cf89dd45b91dfec44eafc7b149d34947ce4df6c2 Mon Sep 17 00:00:00 2001
From: Martin Basti <[email protected]>
Date: Tue, 19 Jul 2016 12:09:29 +0200
Subject: [PATCH 1/2] CI tests: improve log collecting
We should collect as much as possible relevant logs to be able do better
investigation from test automation
---
ipaplatform/base/paths.py | 1 +
ipatests/test_integration/tasks.py | 60 +++++++++++++++++++++++++++++---------
2 files changed, 47 insertions(+), 14 deletions(-)
diff --git a/ipaplatform/base/paths.py b/ipaplatform/base/paths.py
index d6fbe32f6839a5db40148777132ba1454cbc3382..4e9b41974541acc676c3f6b2399cbf8f5808642a 100644
--- a/ipaplatform/base/paths.py
+++ b/ipaplatform/base/paths.py
@@ -300,6 +300,7 @@ class BasePathNamespace(object):
SLAPD_INSTANCE_ACCESS_LOG_TEMPLATE = "/var/log/dirsrv/slapd-%s/access"
SLAPD_INSTANCE_ERROR_LOG_TEMPLATE = "/var/log/dirsrv/slapd-%s/errors"
VAR_LOG_HTTPD_DIR = "/var/log/httpd"
+ VAR_LOG_HTTPD_ERROR = "/var/log/httpd/error_log"
IPABACKUP_LOG = "/var/log/ipabackup.log"
IPACLIENT_INSTALL_LOG = "/var/log/ipaclient-install.log"
IPACLIENT_UNINSTALL_LOG = "/var/log/ipaclient-uninstall.log"
diff --git a/ipatests/test_integration/tasks.py b/ipatests/test_integration/tasks.py
index cee6c15ccdc260f6ebe4cdebbc2cf6ec84931f27..be9febe3402841f23472e7a09b8f97d1da8f1430 100644
--- a/ipatests/test_integration/tasks.py
+++ b/ipatests/test_integration/tasks.py
@@ -47,6 +47,49 @@ from ipalib.constants import DOMAIN_LEVEL_0
log = log_mgr.get_logger(__name__)
+def setup_server_logs_collecting(host):
+ """
+ This function setup logs to be collected on host. We should collect all
+ possible logs that may be helpful to debug IPA server
+ """
+ # dirsrv logs
+ inst = host.domain.realm.replace('.', '-')
+ host.collect_log(paths.SLAPD_INSTANCE_ERROR_LOG_TEMPLATE % inst)
+ host.collect_log(paths.SLAPD_INSTANCE_ACCESS_LOG_TEMPLATE % inst)
+
+ # IPA install logs
+ host.collect_log(paths.IPASERVER_INSTALL_LOG)
+ host.collect_log(paths.IPACLIENT_INSTALL_LOG)
+ host.collect_log(paths.IPAREPLICA_INSTALL_LOG)
+ host.collect_log(paths.IPAREPLICA_CONNCHECK_LOG)
+ host.collect_log(paths.IPAREPLICA_CA_INSTALL_LOG)
+ host.collect_log(paths.IPACLIENT_INSTALL_LOG)
+ host.collect_log(paths.IPASERVER_KRA_INSTALL_LOG)
+ host.collect_log(paths.IPASERVER_CA_INSTALL_LOG)
+ host.collect_log(paths.IPA_CUSTODIA_AUDIT_LOG)
+
+ # IPA uninstall logs
+ host.collect_log(paths.IPASERVER_KRA_UNINSTALL_LOG)
+ host.collect_log(paths.IPACLIENT_UNINSTALL_LOG)
+ host.collect_log(paths.IPASERVER_KRA_UNINSTALL_LOG)
+
+ # IPA backup and restore logs
+ host.collect_log(paths.IPARESTORE_LOG)
+ host.collect_log(paths.IPABACKUP_LOG)
+
+ # kerberos related logs
+ host.collect_log(paths.KADMIND_LOG)
+
+ # httpd logs
+ host.collect_log(paths.VAR_LOG_HTTPD_ERROR)
+
+ # dogtag logs
+ host.collect_log(os.path.join(paths.VAR_LOG_PKI_DIR))
+
+ # SSSD debugging must be set after client is installed (function
+ # setup_sssd_debugging)
+
+
def check_arguments_are(slice, instanceof):
"""
:param: slice - tuple of integers denoting the beginning and the end
@@ -234,12 +277,7 @@ def install_master(host, setup_dns=True, setup_kra=False, extra_args=(),
domain_level=None):
if domain_level is None:
domain_level = host.config.domain_level
- host.collect_log(paths.IPASERVER_INSTALL_LOG)
- host.collect_log(paths.IPACLIENT_INSTALL_LOG)
- inst = host.domain.realm.replace('.', '-')
- host.collect_log(paths.SLAPD_INSTANCE_ERROR_LOG_TEMPLATE % inst)
- host.collect_log(paths.SLAPD_INSTANCE_ACCESS_LOG_TEMPLATE % inst)
-
+ setup_server_logs_collecting(host)
apply_common_fixes(host)
fix_apache_semaphores(host)
@@ -321,8 +359,7 @@ def install_replica(master, replica, setup_ca=True, setup_dns=False,
if domain_level is None:
domain_level = domainlevel(master)
apply_common_fixes(replica)
- replica.collect_log(paths.IPAREPLICA_INSTALL_LOG)
- replica.collect_log(paths.IPAREPLICA_CONNCHECK_LOG)
+ setup_server_logs_collecting(replica)
allow_sync_ptr(master)
# Otherwise ipa-client-install would not create a PTR
# and replica installation would fail
@@ -400,12 +437,7 @@ def install_adtrust(host):
Configures the compat tree for the legacy clients.
"""
- # ipa-adtrust-install appends to ipaserver-install.log
- host.collect_log(paths.IPASERVER_INSTALL_LOG)
-
- inst = host.domain.realm.replace('.', '-')
- host.collect_log(paths.SLAPD_INSTANCE_ERROR_LOG_TEMPLATE % inst)
- host.collect_log(paths.SLAPD_INSTANCE_ACCESS_LOG_TEMPLATE % inst)
+ setup_server_logs_collecting(host)
kinit_admin(host)
host.run_command(['ipa-adtrust-install', '-U',
--
2.5.5
From 33c05e0455a6f7fdcc4a2a6651adcb0c50484b16 Mon Sep 17 00:00:00 2001
From: Martin Basti <[email protected]>
Date: Wed, 20 Jul 2016 17:35:32 +0200
Subject: [PATCH 2/2] CI tests: fix SSSD log collecting
Wildcard '*' has not been working for log collecting. I just set
the whole SSSD log directory to be collected. tar utility is able to
archive whole directories.
---
ipatests/test_integration/tasks.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/ipatests/test_integration/tasks.py b/ipatests/test_integration/tasks.py
index be9febe3402841f23472e7a09b8f97d1da8f1430..c38cbd2da2a21f712418e125d6e4e466d79ff75d 100644
--- a/ipatests/test_integration/tasks.py
+++ b/ipatests/test_integration/tasks.py
@@ -560,7 +560,7 @@ def setup_sssd_debugging(host):
paths.SSSD_CONF],
raiseonerr=False)
- host.collect_log(os.path.join(paths.VAR_LOG_SSSD_DIR, '*'))
+ host.collect_log(os.path.join(paths.VAR_LOG_SSSD_DIR))
# Clear the cache and restart SSSD
clear_sssd_cache(host)
--
2.5.5
--
Manage your subscription for the Freeipa-devel mailing list:
https://www.redhat.com/mailman/listinfo/freeipa-devel
Contribute to FreeIPA: http://www.freeipa.org/page/Contribute/Code
