[Freeipa-devel] [freeipa PR#2096][closed] [testing_master] Nightly PR
URL: https://github.com/freeipa/freeipa/pull/2096 Author: freeipa-pr-ci Title: #2096: [testing_master] Nightly PR Action: closed To pull the PR as Git branch: git remote add ghfreeipa https://github.com/freeipa/freeipa git fetch ghfreeipa pull/2096/head:pr2096 git checkout pr2096 ___ 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://getfedora.org/code-of-conduct.html List Guidelines: https://fedoraproject.org/wiki/Mailing_list_guidelines List Archives: https://lists.fedoraproject.org/archives/list/freeipa-devel@lists.fedorahosted.org/message/2AFCKR33S5EDQCBVZWD35NAWDESJ2KX6/
[Freeipa-devel] [freeipa PR#2100][opened] [testing_master] Nightly PR
URL: https://github.com/freeipa/freeipa/pull/2100
Author: freeipa-pr-ci
Title: #2100: [testing_master] Nightly PR
Action: opened
PR body:
"""
None
"""
To pull the PR as Git branch:
git remote add ghfreeipa https://github.com/freeipa/freeipa
git fetch ghfreeipa pull/2100/head:pr2100
git checkout pr2100
From f6d5996bc5bcc2b36e1c7856c17171b5c68d9c89 Mon Sep 17 00:00:00 2001
From: root
Date: Wed, 4 Jul 2018 23:45:07 +
Subject: [PATCH] automated commit
---
.freeipa-pr-ci.yaml | 580 +++-
1 file changed, 524 insertions(+), 56 deletions(-)
diff --git a/.freeipa-pr-ci.yaml b/.freeipa-pr-ci.yaml
index cd3e5e5e61..032b9e3d87 100644
--- a/.freeipa-pr-ci.yaml
+++ b/.freeipa-pr-ci.yaml
@@ -11,6 +11,18 @@ topologies:
name: master_1repl_1client
cpu: 4
memory: 6700
+ ipaserver:
+name: ipaserver
+cpu: 1
+memory: 2400
+ master_2repl_1client: _2repl_1client
+name: master_2repl_1client
+cpu: 5
+memory: 9100
+ master_3repl_1client: _3repl_1client
+name: master_3repl_1client
+cpu: 6
+memory: 11500
jobs:
fedora-28/build:
@@ -23,23 +35,239 @@ jobs:
git_refspec: '{git_refspec}'
template:
name: freeipa/ci-master-f28
- version: 0.1.5
+ version: 0.1.6
timeout: 1800
topology: *build
- fedora-28/simple_replication:
+ fedora-28/test_server_del:
requires: [fedora-28/build]
priority: 50
job:
class: RunPytest
args:
build_url: '{fedora-28/build_url}'
-test_suite: test_integration/test_simple_replication.py
+test_suite: test_integration/test_server_del.py
template: *ci-master-f28
-timeout: 3600
+timeout: 8000
+topology: *master_2repl_1client
+
+ fedora-28/test_installation_TestInstallWithCA1:
+requires: [fedora-28/build]
+priority: 50
+job:
+ class: RunPytest
+ args:
+build_url: '{fedora-28/build_url}'
+test_suite: test_integration/test_installation.py::TestInstallWithCA1
+template: *ci-master-f28
+timeout: 10800
+topology: *master_3repl_1client
+
+ fedora-28/test_installation_TestInstallWithCA2:
+requires: [fedora-28/build]
+priority: 50
+job:
+ class: RunPytest
+ args:
+build_url: '{fedora-28/build_url}'
+test_suite: test_integration/test_installation.py::TestInstallWithCA2
+template: *ci-master-f28
+timeout: 10800
+topology: *master_3repl_1client
+
+ fedora-28/test_installation_TestInstallWithCA_KRA1:
+requires: [fedora-28/build]
+priority: 50
+job:
+ class: RunPytest
+ args:
+build_url: '{fedora-28/build_url}'
+test_suite: test_integration/test_installation.py::TestInstallWithCA_KRA1
+template: *ci-master-f28
+timeout: 10800
+topology: *master_3repl_1client
+
+ fedora-28/test_installation_TestInstallWithCA_KRA2:
+requires: [fedora-28/build]
+priority: 50
+job:
+ class: RunPytest
+ args:
+build_url: '{fedora-28/build_url}'
+test_suite: test_integration/test_installation.py::TestInstallWithCA_KRA2
+template: *ci-master-f28
+timeout: 10800
+topology: *master_3repl_1client
+
+ fedora-28/test_installation_TestInstallWithCA_DNS1:
+requires: [fedora-28/build]
+priority: 50
+job:
+ class: RunPytest
+ args:
+build_url: '{fedora-28/build_url}'
+test_suite: test_integration/test_installation.py::TestInstallWithCA_DNS1
+template: *ci-master-f28
+timeout: 10800
+topology: *master_3repl_1client
+
+ fedora-28/test_installation_TestInstallWithCA_DNS2:
+requires: [fedora-28/build]
+priority: 50
+job:
+ class: RunPytest
+ args:
+build_url: '{fedora-28/build_url}'
+test_suite: test_integration/test_installation.py::TestInstallWithCA_DNS2
+template: *ci-master-f28
+timeout: 10800
+topology: *master_3repl_1client
+
+ fedora-28/test_installation_TestInstallWithCA_KRA_DNS1:
+requires: [fedora-28/build]
+priority: 50
+job:
+ class: RunPytest
+ args:
+build_url: '{fedora-28/build_url}'
+test_suite: test_integration/test_installation.py::TestInstallWithCA_KRA_DNS1
+template: *ci-master-f28
+timeout: 10800
+topology: *master_3repl_1client
+
+ fedora-28/test_installation_TestInstallWithCA_KRA_DNS2:
+requires: [fedora-28/build]
+priority: 50
+job:
+ class: RunPytest
+ args:
+build_url: '{fedora-28/build_url}'
+test_suite: test_integration/test_installation.py::TestInstallWithCA_KRA_DNS2
+template: *ci-master-f28
+timeout: 10800
+topology: *master_3repl_1client
+
+ fedora-28/test_installation_TestInstallMaster:
+requires: [fedora-28/build]
+priority: 50
+job:
+ class: RunPytest
+
[Freeipa-devel] [freeipa PR#2050][closed] Extend Sub CA replication test
URL: https://github.com/freeipa/freeipa/pull/2050 Author: tiran Title: #2050: Extend Sub CA replication test Action: closed To pull the PR as Git branch: git remote add ghfreeipa https://github.com/freeipa/freeipa git fetch ghfreeipa pull/2050/head:pr2050 git checkout pr2050 ___ 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://getfedora.org/code-of-conduct.html List Guidelines: https://fedoraproject.org/wiki/Mailing_list_guidelines List Archives: https://lists.fedoraproject.org/archives/list/freeipa-devel@lists.fedorahosted.org/message/UTO7FTPKJEEDWM3NIYB754UQHJRPGXMH/
[Freeipa-devel] [freeipa PR#2098][opened] ipa_tests: ipa-replica-prepare stuck on user input
URL: https://github.com/freeipa/freeipa/pull/2098
Author: Rezney
Title: #2098: ipa_tests: ipa-replica-prepare stuck on user input
Action: opened
PR body:
"""
TestOldReplicaWorksAfterDomainUpgrade is getting stuck while
running "ipa-replica-prepare" as it is asking for user input:
"Do you want to search for missing reverse zones?". Adding
"--auto-reverse" in order to continue.
"""
To pull the PR as Git branch:
git remote add ghfreeipa https://github.com/freeipa/freeipa
git fetch ghfreeipa pull/2098/head:pr2098
git checkout pr2098
From b0d86818e3e79d05cd4e3e826bc53ecb3d01c38e Mon Sep 17 00:00:00 2001
From: Michal Reznik
Date: Wed, 4 Jul 2018 10:05:32 +0200
Subject: [PATCH 1/2] ipa_tests: ipa-replica-prepare stuck on user input
TestOldReplicaWorksAfterDomainUpgrade is getting stuck while
running "ipa-replica-prepare" as it is asking for user input:
"Do you want to search for missing reverse zones?". Adding
"--auto-reverse" in order to continue.
---
ipatests/pytest_plugins/integration/tasks.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/ipatests/pytest_plugins/integration/tasks.py b/ipatests/pytest_plugins/integration/tasks.py
index 6a12e78fe7..54c12bf783 100644
--- a/ipatests/pytest_plugins/integration/tasks.py
+++ b/ipatests/pytest_plugins/integration/tasks.py
@@ -379,7 +379,7 @@ def replica_prepare(master, replica, extra_args=(),
'-p', replica.config.dirman_password,
replica.hostname]
if master_authoritative_for_client_domain(master, replica):
-args.extend(['--ip-address', replica.ip])
+args.extend(['--ip-address', replica.ip, '--auto-reverse'])
args.extend(extra_args)
result = master.run_command(args, raiseonerr=raiseonerr,
stdin_text=stdin_text)
From 77b072abff2572fae9adb439dd3a8a20d00d8eb0 Mon Sep 17 00:00:00 2001
From: Michal Reznik
Date: Wed, 4 Jul 2018 11:23:22 +0200
Subject: [PATCH 2/2] TEMP COMMIT - activate other PRCI test
---
.freeipa-pr-ci.yaml | 14 +-
1 file changed, 13 insertions(+), 1 deletion(-)
diff --git a/.freeipa-pr-ci.yaml b/.freeipa-pr-ci.yaml
index cd3e5e5e61..c7a08f72cd 100644
--- a/.freeipa-pr-ci.yaml
+++ b/.freeipa-pr-ci.yaml
@@ -23,7 +23,7 @@ jobs:
git_refspec: '{git_refspec}'
template:
name: freeipa/ci-master-f28
- version: 0.1.5
+ version: 0.1.6
timeout: 1800
topology: *build
@@ -230,3 +230,15 @@ jobs:
template: *ci-master-f28
timeout: 3600
topology: *master_1repl
+
+ fedora-28/test_replica_promotion_TestOldReplicaWorksAfterDomainUpgrade:
+requires: [fedora-28/build]
+priority: 50
+job:
+ class: RunPytest
+ args:
+build_url: '{fedora-28/build_url}'
+test_suite: test_integration/test_replica_promotion.py::TestOldReplicaWorksAfterDomainUpgrade
+template: *ci-master-f28
+timeout: 7200
+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://getfedora.org/code-of-conduct.html
List Guidelines: https://fedoraproject.org/wiki/Mailing_list_guidelines
List Archives:
https://lists.fedoraproject.org/archives/list/freeipa-devel@lists.fedorahosted.org/message/XDSWIQOKHRN2Y7GX47DQFAGBK6VCBDWX/
[Freeipa-devel] [freeipa PR#2097][opened] [py37] Import ABCs from collections.abc
URL: https://github.com/freeipa/freeipa/pull/2097 Author: tiran Title: #2097: [py37] Import ABCs from collections.abc Action: opened PR body: """ Python 3 has moved all collection abstract base classes to collections.abc. Python 3.7 started to deprecate the old aliases. The whole import block needs to be protected with import-error and no-name-in-module, because Python 2 doesn't have collections.abc module and collections.abc.Mapping, while Python 3 doesn't have collections.Mapping. Fixes: https://pagure.io/freeipa/issue/7609 Signed-off-by: Christian Heimes """ To pull the PR as Git branch: git remote add ghfreeipa https://github.com/freeipa/freeipa git fetch ghfreeipa pull/2097/head:pr2097 git checkout pr2097 From aaf01f2bb481923dcd1912bb2a79186a61799c06 Mon Sep 17 00:00:00 2001 From: Christian Heimes Date: Wed, 4 Jul 2018 10:07:49 +0200 Subject: [PATCH] [py37] Import ABCs from collections.abc Python 3 has moved all collection abstract base classes to collections.abc. Python 3.7 started to deprecate the old aliases. The whole import block needs to be protected with import-error and no-name-in-module, because Python 2 doesn't have collections.abc module and collections.abc.Mapping, while Python 3 doesn't have collections.Mapping. Fixes: https://pagure.io/freeipa/issue/7609 Signed-off-by: Christian Heimes --- ipaclient/remote_plugins/__init__.py | 12 ++-- ipaclient/remote_plugins/schema.py | 12 +--- ipalib/plugable.py | 9 - ipaplatform/base/services.py | 9 +++-- ipapython/ipaldap.py | 12 +--- ipaserver/dnssec/ldapkeydb.py| 12 ++-- ipaserver/dnssec/localhsm.py | 13 +++-- ipatests/test_xmlrpc/xmlrpc_test.py | 9 +++-- 8 files changed, 71 insertions(+), 17 deletions(-) diff --git a/ipaclient/remote_plugins/__init__.py b/ipaclient/remote_plugins/__init__.py index f1ff22e28e..fe75b81b88 100644 --- a/ipaclient/remote_plugins/__init__.py +++ b/ipaclient/remote_plugins/__init__.py @@ -2,7 +2,6 @@ # Copyright (C) 2016 FreeIPA Contributors see COPYING for license # -import collections import errno import json import locale @@ -10,16 +9,25 @@ import os import time +import six + from . import compat from . import schema from ipaclient.plugins.rpcclient import rpcclient from ipalib.constants import USER_CACHE_PATH from ipapython.dnsutil import DNSName +# pylint: disable=no-name-in-module, import-error +if six.PY3: +from collections.abc import MutableMapping +else: +from collections import MutableMapping +# pylint: enable=no-name-in-module, import-error + logger = logging.getLogger(__name__) -class ServerInfo(collections.MutableMapping): +class ServerInfo(MutableMapping): _DIR = os.path.join(USER_CACHE_PATH, 'ipa', 'servers') def __init__(self, api): diff --git a/ipaclient/remote_plugins/schema.py b/ipaclient/remote_plugins/schema.py index 863d8f1992..d9a5fb0361 100644 --- a/ipaclient/remote_plugins/schema.py +++ b/ipaclient/remote_plugins/schema.py @@ -2,7 +2,6 @@ # Copyright (C) 2016 FreeIPA Contributors see COPYING for license # -import collections import errno import json import logging @@ -27,6 +26,13 @@ from ipapython.dn import DN from ipapython.dnsutil import DNSName +# pylint: disable=no-name-in-module, import-error +if six.PY3: +from collections.abc import Mapping, Sequence +else: +from collections import Mapping, Sequence +# pylint: enable=no-name-in-module, import-error + logger = logging.getLogger(__name__) FORMAT = '1' @@ -39,7 +45,7 @@ 'DNSName': DNSName, 'Principal': unicode, 'NoneType': type(None), -'Sequence': collections.Sequence, +'Sequence': Sequence, 'bool': bool, 'dict': dict, 'int': int, @@ -315,7 +321,7 @@ class _SchemaObjectPlugin(_SchemaPlugin): schema_key = 'classes' -class _SchemaNameSpace(collections.Mapping): +class _SchemaNameSpace(Mapping): def __init__(self, schema, name): self.name = name diff --git a/ipalib/plugable.py b/ipalib/plugable.py index d78a607123..7cf99a0c60 100644 --- a/ipalib/plugable.py +++ b/ipalib/plugable.py @@ -51,6 +51,13 @@ LOGGING_FORMAT_STDERR) from ipapython.version import VERSION, API_VERSION, DEFAULT_PLUGINS +# pylint: disable=no-name-in-module, import-error +if six.PY3: +from collections.abc import Mapping +else: +from collections import Mapping +# pylint: enable=no-name-in-module, import-error + if six.PY3: unicode = str @@ -282,7 +289,7 @@ def __repr__(self): ) -class APINameSpace(collections.Mapping): +class APINameSpace(Mapping): def __init__(self, api, base): self.__api = api self.__base = base diff --git a/ipaplatform/base/services.py b/ipaplatform/base/services.py index 13168585ca..95a9302463 100644 --- a/ipaplatform/base/services.py +++ b/ipaplatform/base/services.py @@ -28,7 +28,6 @@ import os import json import time
[Freeipa-devel] [freeipa PR#2076][closed] ui_tests - stabilization fixes + test_config fix
URL: https://github.com/freeipa/freeipa/pull/2076 Author: Rezney Title: #2076: ui_tests - stabilization fixes + test_config fix Action: closed To pull the PR as Git branch: git remote add ghfreeipa https://github.com/freeipa/freeipa git fetch ghfreeipa pull/2076/head:pr2076 git checkout pr2076 ___ 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://getfedora.org/code-of-conduct.html List Guidelines: https://fedoraproject.org/wiki/Mailing_list_guidelines List Archives: https://lists.fedoraproject.org/archives/list/freeipa-devel@lists.fedorahosted.org/message/IMXLZWSESHUF2F6GBRYFDTQ4RI3DMRFH/
[Freeipa-devel] [freeipa PR#2098][closed] ipa_tests: ipa-replica-prepare stuck on user input
URL: https://github.com/freeipa/freeipa/pull/2098 Author: Rezney Title: #2098: ipa_tests: ipa-replica-prepare stuck on user input Action: closed To pull the PR as Git branch: git remote add ghfreeipa https://github.com/freeipa/freeipa git fetch ghfreeipa pull/2098/head:pr2098 git checkout pr2098 ___ 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://getfedora.org/code-of-conduct.html List Guidelines: https://fedoraproject.org/wiki/Mailing_list_guidelines List Archives: https://lists.fedoraproject.org/archives/list/freeipa-devel@lists.fedorahosted.org/message/LBPF43I4YHASYCX7R3SLP262EEH4PWPY/
[Freeipa-devel] [freeipa PR#2099][opened] ipa-server-install: fix zonemgr argument validator
URL: https://github.com/freeipa/freeipa/pull/2099
Author: netoarmando
Title: #2099: ipa-server-install: fix zonemgr argument validator
Action: opened
PR body:
"""
Fix `ERROR 'str' object has no attribute 'decode'` when `--zonemgr` is
passed to ipa-server-install.
Solution copied from commit 75d26e1, function
`ipaserver.install.bindinstance.zonemgr_callback` duplicates the behavior of
the method affected by this patch.
Issue: https://pagure.io/freeipa/issue/7612
"""
To pull the PR as Git branch:
git remote add ghfreeipa https://github.com/freeipa/freeipa
git fetch ghfreeipa pull/2099/head:pr2099
git checkout pr2099
From 5f07676a75f0056b7cfca1e320aa1e2e43ca4750 Mon Sep 17 00:00:00 2001
From: Armando Neto
Date: Tue, 3 Jul 2018 17:12:07 -0300
Subject: [PATCH 1/2] ipa-server-install: fix zonemgr argument validator
Fix `ERROR 'str' object has no attribute 'decode'` when --zonemgr is
passed to ipa-server-install.
Solution copied from commit 75d26e1f0121f875bdb017b0636c02a6f5660e8a,
function `ipaserver.install.bindinstance.zonemgr_callback` duplicates
the behavior of the method affected by this patch.
Issue: https://pagure.io/freeipa/issue/7612
Signed-off-by: Armando Neto
---
ipaserver/install/dns.py | 6 +-
ipatests/test_integration/test_installation.py | 17 +
2 files changed, 22 insertions(+), 1 deletion(-)
diff --git a/ipaserver/install/dns.py b/ipaserver/install/dns.py
index 40a3c0b49b..61b4a851e4 100644
--- a/ipaserver/install/dns.py
+++ b/ipaserver/install/dns.py
@@ -476,7 +476,11 @@ def zonemgr(self, value):
encoding = getattr(sys.stdin, 'encoding', None)
if encoding is None:
encoding = 'utf-8'
-value = value.decode(encoding)
+
+# value is string in py2 and py3
+if not isinstance(value, unicode):
+value = value.decode(encoding)
+
bindinstance.validate_zonemgr_str(value)
except ValueError as e:
# FIXME we can do this in better way
diff --git a/ipatests/test_integration/test_installation.py b/ipatests/test_integration/test_installation.py
index ad45f58111..1d3726ca77 100644
--- a/ipatests/test_integration/test_installation.py
+++ b/ipatests/test_integration/test_installation.py
@@ -460,3 +460,20 @@ def test_reserved_ip_as_forwarder(self):
exp_str = ("Invalid IP Address 0.0.0.0: cannot use IANA reserved "
"IP address 0.0.0.0")
assert exp_str in cmd.stdout_text
+
+
+class TestInstallDNSOptions(IntegrationTest):
+
+num_replicas = 0
+
+@classmethod
+def install(cls, mh):
+pass
+
+def test_install_master_with_zonemgr_arg(self):
+"""Test setup dns with zonemgr option"""
+tasks.install_master(
+self.master,
+setup_dns=True,
+extra_args=['--zonemgr', 'm...@example.org'],
+)
From ad8cd86d573584e9a19b7f4fceb03fe6c8f00dfd Mon Sep 17 00:00:00 2001
From: Armando Neto
Date: Wed, 4 Jul 2018 17:05:55 -0300
Subject: [PATCH 2/2] temp commit
---
.freeipa-pr-ci.yaml | 198 +---
1 file changed, 3 insertions(+), 195 deletions(-)
diff --git a/.freeipa-pr-ci.yaml b/.freeipa-pr-ci.yaml
index cd3e5e5e61..67ff8fd193 100644
--- a/.freeipa-pr-ci.yaml
+++ b/.freeipa-pr-ci.yaml
@@ -27,206 +27,14 @@ jobs:
timeout: 1800
topology: *build
- fedora-28/simple_replication:
+ fedora-28/test_install_dns_options:
requires: [fedora-28/build]
priority: 50
job:
class: RunPytest
args:
build_url: '{fedora-28/build_url}'
-test_suite: test_integration/test_simple_replication.py
+test_suite: test_integration/test_installation.py::TestInstallDNSOptions
template: *ci-master-f28
timeout: 3600
-topology: *master_1repl
-
- fedora-28/caless:
-requires: [fedora-28/build]
-priority: 50
-job:
- class: RunPytest
- args:
-build_url: '{fedora-28/build_url}'
-test_suite: test_integration/test_caless.py::TestServerReplicaCALessToCAFull
-template: *ci-master-f28
-timeout: 3600
-topology: *master_1repl
-
- fedora-28/external_ca_1:
-requires: [fedora-28/build]
-priority: 50
-job:
- class: RunPytest
- args:
-build_url: '{fedora-28/build_url}'
-test_suite: test_integration/test_external_ca.py::TestExternalCA
-template: *ci-master-f28
-timeout: 3600
-topology: *master_1repl_1client
-
- fedora-28/external_ca_2:
-requires: [fedora-28/build]
-priority: 50
-job:
- class: RunPytest
- args:
-build_url: '{fedora-28/build_url}'
-test_suite: test_integration/test_external_ca.py::TestSelfExternalSelf test_integration/test_external_ca.py::TestExternalCAInstall
-template: *ci-master-f28
-timeout: 3600
-topology: *master_1repl
-
-
