From be4bd1f8828ab5a5bdb9e6d3c040ca2f7b5ae7c4 Mon Sep 17 00:00:00 2001
From: Panu Matilainen <pmatilai@redhat.com>
Date: Mon, 3 Jun 2019 12:30:07 +0300
Subject: Run full distcheck as the CI test for wider coverage

Unlike plain "check", this will catch regressions to out-of-tree builds,
source files present in git but missing in tarballs, etc so they are
found when introduced instead of pre-release heat.

To make this work we need to move the working dir inside docker away
from /opt, the combination of root user and distcheck blows the our whole
directory away at some point and things dont work so well after that.

In addition, rpmtests.log is no more in a nice and easy location
because it's failing somewhere inside the nested build thingie, so
try to find it...

We also need a few more packages installed now: git for the changelog
and doxygen for api docs. And ima-evm-utils-devel to build the plugin,
not the utils.

(cherry picked from commit 595c4f274084e1afff74c3211b0bee3bf6a9b3cd)
---
 ci/Dockerfile | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/ci/Dockerfile b/ci/Dockerfile
index 17b6f7b28..af10cc104 100644
--- a/ci/Dockerfile
+++ b/ci/Dockerfile
@@ -1,7 +1,7 @@
 FROM fedora:31
 MAINTAINER rpm-maint@lists.rpm.org
 
-WORKDIR /opt/rpm
+WORKDIR /srv/rpm
 
 RUN echo -e "deltarpm=0\ninstall_weak_deps=0\ntsflags=nodocs" >> /etc/dnf/dnf.conf
 RUN dnf -y update
@@ -10,8 +10,10 @@ RUN dnf -y install \
   automake \
   libtool \
   gettext-devel \
+  doxygen \
   make \
   gcc \
+  git-core \
   zlib-devel \
   bzip2-devel \
   xz-devel \
@@ -25,7 +27,7 @@ RUN dnf -y install \
   libdb-devel \
   lmdb-devel \
   libselinux-devel \
-  ima-evm-utils \
+  ima-evm-utils-devel \
   libcap-devel \
   libacl-devel \
   lua-devel readline-devel \
@@ -54,4 +56,4 @@ RUN ./configure \
 
 RUN make -j
 
-CMD make check; rc=$?; cat tests/rpmtests.log; exit $rc
+CMD make -j distcheck; rc=$?; find . -name rpmtests.log|xargs cat; exit $rc
-- 
cgit v1.2.1