ehlo,

Integration tests are enabled on debian with the last patch.
I just changed DEPS_INTGCHECK_SATISFIED to true for debian
because in future we might introduce new dependencies
which will not be in debian (su_wrapper).

The 1st patch is prequisity for the last patch because
installation of slapd requires user interaction.
The ticket #2433 is finally fixed after 13 months.

If we do not want to introduce new dependency /usr/bin/libtool
for debian then there is alternative solution of bug fixed
in the 2nd patch. We can run libtool from CWD generated by autotools.
In both cases it's a oneliner :-)

Here is an alternative version:

diff --git a/contrib/ci/run b/contrib/ci/run
index 5f668ff..1f64e67 100755
--- a/contrib/ci/run
+++ b/contrib/ci/run
@@ -204,7 +204,7 @@ function build_debug()
     CK_FORK=no \
         stage make-check-valgrind \
                 make-check-wrap -j $CPU_NUM check -- \
-                                libtool --mode=execute \
+                                ./libtool --mode=execute \
                                     valgrind-condense 99 \
                                     '!(*.py|*dlopen-tests)' -- \
                                     --trace-children=yes \


LS
>From 6175bd3f05cbfd5f7d9b26770d9a98012803745c Mon Sep 17 00:00:00 2001
From: Lukas Slebodnik <lsleb...@redhat.com>
Date: Tue, 29 Sep 2015 11:52:30 +0200
Subject: [PATCH 1/3] CI: Don't depend on user input with apt-get

Resolves:
https://fedorahosted.org/sssd/ticket/2433
---
 contrib/ci/README.md | 6 ++++++
 contrib/ci/distro.sh | 2 ++
 2 files changed, 8 insertions(+)

diff --git a/contrib/ci/README.md b/contrib/ci/README.md
index 
6b5f7f30eac8327d5aa45c3bfefd57e8d3109fe0..075bc3e074cb13916619f46c12c6d1a4de0158a2
 100644
--- a/contrib/ci/README.md
+++ b/contrib/ci/README.md
@@ -47,6 +47,12 @@ and Debian-based distros:
 
 Where `<USER>` is the user invoking CI.
 
+You might also want to allow to keep environment variable DEBIAN_FRONTEND
+on debian. So script can perform an unattended installation of a Debian package
+with apt-get.
+    Defaults!/usr/bin/apt-get env_keep += "DEBIAN_FRONTEND
+
+
 On Red Hat distros a repository carrying dependencies missing from some
 distros needs to be added to yum configuration. See instructions on the
 [Copr project 
page](http://copr-fe.cloud.fedoraproject.org/coprs/lslebodn/sssd-deps/).
diff --git a/contrib/ci/distro.sh b/contrib/ci/distro.sh
index 
5416bfff325c4e5d0a10ebea67cba26e20e03fd5..095985ccae81e54bcd79607e455a1c9295aad867
 100644
--- a/contrib/ci/distro.sh
+++ b/contrib/ci/distro.sh
@@ -30,6 +30,8 @@ if [ -e /etc/redhat-release ]; then
     DISTRO_FAMILY=redhat
 elif [ -e /etc/debian_version ]; then
     DISTRO_FAMILY=debian
+    # Perform an unattended installation of a Debian package with apt-get
+    export DEBIAN_FRONTEND=noninteractive
 else
     DISTRO_FAMILY=unknown
 fi
-- 
2.5.0

>From 3e0ce9c714d5dc11eaf5ff00792eb06d3b98ff90 Mon Sep 17 00:00:00 2001
From: Lukas Slebodnik <lsleb...@redhat.com>
Date: Tue, 29 Sep 2015 12:29:51 +0200
Subject: [PATCH 2/3] CI: Add missing dependency for debian

All test failed due to missing /usr/bin/libtool

e.g.
/home/build/sssd/build/test-driver: line 107: libtool: command not found
FAIL test-io (exit status: 127)
---
 contrib/ci/deps.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/contrib/ci/deps.sh b/contrib/ci/deps.sh
index 
22b7276ebdb8e3ba5e1e34334adbe310cbff8bad..7979f2febc338ac5b823837dd0ab8650c285b79d
 100644
--- a/contrib/ci/deps.sh
+++ b/contrib/ci/deps.sh
@@ -106,6 +106,7 @@ if [[ "$DISTRO_BRANCH" == -debian-* ]]; then
         xml-core
         xsltproc
         libssl-dev
+        libtool-bin
     )
     DEPS_INTGCHECK_SATISFIED=false
 fi
-- 
2.5.0

>From bc1a6d7c285546959a0de51f5ce099e2bffd64b4 Mon Sep 17 00:00:00 2001
From: Lukas Slebodnik <lsleb...@redhat.com>
Date: Tue, 29 Sep 2015 12:57:24 +0200
Subject: [PATCH 3/3] CI: Run integration tests on debian testing

---
 contrib/ci/deps.sh | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/contrib/ci/deps.sh b/contrib/ci/deps.sh
index 
7979f2febc338ac5b823837dd0ab8650c285b79d..221b3e3b8d9ae238d946e2f09db60a0f53e138e2
 100644
--- a/contrib/ci/deps.sh
+++ b/contrib/ci/deps.sh
@@ -107,8 +107,15 @@ if [[ "$DISTRO_BRANCH" == -debian-* ]]; then
         xsltproc
         libssl-dev
         libtool-bin
+        fakeroot
+        libnss-wrapper
+        libuid-wrapper
+        python-pytest
+        python-ldap
+        ldap-utils
+        slapd
     )
-    DEPS_INTGCHECK_SATISFIED=false
+    DEPS_INTGCHECK_SATISFIED=true
 fi
 
 declare -a -r DEPS_LIST
-- 
2.5.0

_______________________________________________
sssd-devel mailing list
sssd-devel@lists.fedorahosted.org
https://lists.fedorahosted.org/mailman/listinfo/sssd-devel

Reply via email to