URL: https://github.com/freeipa/freeipa/pull/1691
Author: tiran
Title: #1691: Test with F28 and require Dogtag PKI >= 10.6
Action: opened
PR body:
"""
Update PR-CI to use F28 templates.
Dogtag 10.6 contains SQL NSS DB fixes and full Python 3 support. The
latest version is not yet available in F28. Test builds can be found in
``@freeipa/freeipa-master-4.7`` COPR.
@felipevolpone Please create new build images with
``@freeipa/freeipa-master-4.7`` COPR. I created a new COPR repos because the
old one is full of old junk.
"""
To pull the PR as Git branch:
git remote add ghfreeipa https://github.com/freeipa/freeipa
git fetch ghfreeipa pull/1691/head:pr1691
git checkout pr1691
From b1e8432b193385d1f307a52f0aea7b09afa7191b Mon Sep 17 00:00:00 2001
From: Christian Heimes <chei...@redhat.com>
Date: Wed, 14 Mar 2018 18:32:39 +0100
Subject: [PATCH] Test with F28 and require Dogtag PKI >= 10.6
Update PR-CI to use F28 templates.
Dogtag 10.6 contains SQL NSS DB fixes and full Python 3 support. The
latest version is not yet available in F28. Test builds can be found in
@freeipa/freeipa-master-4.7 COPR.
Signed-off-by: Christian Heimes <chei...@redhat.com>
---
.freeipa-pr-ci.yaml | 30 +++++++++++++++---------------
freeipa.spec.in | 14 ++++++++------
2 files changed, 23 insertions(+), 21 deletions(-)
diff --git a/.freeipa-pr-ci.yaml b/.freeipa-pr-ci.yaml
index b98a27835c..5e386dea96 100644
--- a/.freeipa-pr-ci.yaml
+++ b/.freeipa-pr-ci.yaml
@@ -13,7 +13,7 @@ topologies:
memory: 6700
jobs:
- fedora-27/build:
+ fedora-28/build:
requires: []
priority: 100
job:
@@ -21,44 +21,44 @@ jobs:
args:
git_repo: '{git_repo}'
git_refspec: '{git_refspec}'
- template: &ci-master-f27
- name: freeipa/ci-master-f27
+ template: &ci-master-f28
+ name: freeipa/ci-master-f28
version: 1.0.2
timeout: 1800
topology: *build
- fedora-27/simple_replication:
- requires: [fedora-27/build]
+ fedora-28/simple_replication:
+ requires: [fedora-28/build]
priority: 50
job:
class: RunPytest
args:
- build_url: '{fedora-27/build_url}'
+ build_url: '{fedora-28/build_url}'
test_suite: test_integration/test_simple_replication.py
- template: *ci-master-f27
+ template: *ci-master-f28
timeout: 3600
topology: *master_1repl
- fedora-27/caless:
- requires: [fedora-27/build]
+ fedora-28/caless:
+ requires: [fedora-28/build]
priority: 50
job:
class: RunPytest
args:
- build_url: '{fedora-27/build_url}'
+ build_url: '{fedora-28/build_url}'
test_suite: test_integration/test_caless.py::TestServerReplicaCALessToCAFull
- template: *ci-master-f27
+ template: *ci-master-f28
timeout: 3600
topology: *master_1repl
- fedora-27/external_ca:
- requires: [fedora-27/build]
+ fedora-28/external_ca:
+ requires: [fedora-28/build]
priority: 50
job:
class: RunPytest
args:
- build_url: '{fedora-27/build_url}'
+ build_url: '{fedora-28/build_url}'
test_suite: test_integration/test_external_ca.py
- template: *ci-master-f27
+ template: *ci-master-f28
timeout: 3600
topology: *master_1repl
diff --git a/freeipa.spec.in b/freeipa.spec.in
index c582e013c3..f0246e1ed9 100644
--- a/freeipa.spec.in
+++ b/freeipa.spec.in
@@ -83,6 +83,8 @@
%endif
+# Require Dogtag PKI 10.6.0 with Python 3 and SQL NSSDB fixes
+%global pki_version 10.6.0
%define krb5_base_version %(LC_ALL=C rpm -q --qf '%%{VERSION}' krb5-devel | grep -Eo '^[^.]+\.[^.]+')
@@ -224,7 +226,7 @@ BuildRequires: python2-dns >= 1.15
BuildRequires: jsl
BuildRequires: python2-yubico
# pki Python package
-BuildRequires: pki-base-python2 >= 10.5.1-2
+BuildRequires: python2-pki >= %{pki_version}
BuildRequires: python2-pytest-multihost
BuildRequires: python2-pytest-sourceorder
# 0.4.2: Py3 fix https://bugzilla.redhat.com/show_bug.cgi?id=1476150
@@ -265,7 +267,7 @@ BuildRequires: python3-qrcode-core >= 5.0.0
BuildRequires: python3-dns >= 1.15
BuildRequires: python3-yubico
# pki Python package
-BuildRequires: pki-base-python3 >= 10.5.1-2
+BuildRequires: python3-pki >= %{pki_version}
BuildRequires: python3-pytest-multihost
BuildRequires: python3-pytest-sourceorder
# 0.4.2: Py3 fix https://bugzilla.redhat.com/show_bug.cgi?id=1476150
@@ -363,8 +365,8 @@ Requires: selinux-policy >= %{selinux_policy_version}
Requires(post): selinux-policy-base >= %{selinux_policy_version}
Requires: slapi-nis >= %{slapi_nis_version}
# 10.5.1-2 contains Python 3 vault fix
-Requires: pki-ca >= 10.5.1-2
-Requires: pki-kra >= 10.5.1-2
+Requires: pki-ca >= %{pki_version}
+Requires: pki-kra >= %{pki_version}
Requires(preun): systemd-units
Requires(postun): systemd-units
Requires: policycoreutils >= 2.1.12-5
@@ -434,7 +436,7 @@ BuildRequires: dbus-python
Requires: python2-dns >= 1.15
Requires: python2-kdcproxy >= 0.3
Requires: rpm-libs
-Requires: pki-base-python2 >= 10.5.1-2
+Requires: python2-pki >= %{pki_version}
Requires: python2-augeas
%description -n python2-ipaserver
@@ -468,7 +470,7 @@ Requires: python3-dns >= 1.15
Requires: python3-kdcproxy >= 0.3
Requires: python3-augeas
Requires: rpm-libs
-Requires: pki-base-python3 >= 10.5.1-2
+Requires: python3-pki >= %{pki_version}
%description -n python3-ipaserver
IPA is an integrated solution to provide centrally managed Identity (users,
_______________________________________________
FreeIPA-devel mailing list -- freeipa-devel@lists.fedorahosted.org
To unsubscribe send an email to freeipa-devel-le...@lists.fedorahosted.org
