Build rpm in Cirrus CI, use the same tests/build.sh for Travis CI.

7 files changed, 50 insertions, 35 deletions

diff --git a/.cirrus.yml b/.cirrus.yml
new file mode 100644
index 0000000..01c7994
--- /dev/null
+++ b/.cirrus.yml
@@ -0,0 +1,8 @@
+test_task:
+  container:
+    matrix:
+      image: registry.fedoraproject.org/fedora:rawhide
+      image: registry.fedoraproject.org/fedora:latest
+      image: centos:centos7
+      image: centos:centos6
+  test_script: tests/build.sh
diff --git a/.dockerignore b/.dockerignore
index fc59fe8..78d4e85 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -1,2 +1,2 @@
 .git
-tests/Dockerfile.*
+tests/Dockerfile
diff --git a/.travis.yml b/.travis.yml
index 79498ac..e00cb75 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -12,15 +12,18 @@ stages:
 
 matrix:
   include:
-    - stage: build
-      env: from=registry.fedoraproject.org/fedora:rawhide dockerfile=fedora
-    - stage: build
-      env: from=registry.fedoraproject.org/fedora:28 dockerfile=fedora
-    - stage: build
-      env: from=centos:centos7 dockerfile=centos
-    - stage: build
-      env: from=centos:centos6 dockerfile=centos
+    - stage: build-rpm
+      env: fedora=rawhide
+    - stage: build-rpm
+      env: fedora=28
+    - stage: build-rpm
+      env: centos=centos7
+    - stage: build-rpm
+      env: centos=centos6
+
+before_script:
+- if test -n "$fedora" ; then sed -i "s#^FROM.*#FROM registry.fedoraproject.org/fedora:$fedora#" tests/Dockerfile ; fi
+- if test -n "$centos" ; then sed -i "s#^FROM.*#FROM centos:$centos#" tests/Dockerfile ; fi
 
 script:
-- sed -i "s#^FROM.*#FROM $from#" tests/Dockerfile.$dockerfile
-- docker build -f tests/Dockerfile.$dockerfile .
+- docker build -f tests/Dockerfile .
diff --git a/tests/Dockerfile b/tests/Dockerfile
new file mode 100644
index 0000000..c488964
--- /dev/null
+++ b/tests/Dockerfile
@@ -0,0 +1,4 @@
+FROM registry.fedoraproject.org/fedora
+COPY . /src/
+WORKDIR /src
+RUN tests/build.sh
diff --git a/tests/Dockerfile.centos b/tests/Dockerfile.centos
deleted file mode 100644
index 06013ee..0000000
--- a/tests/Dockerfile.centos
+++ /dev/null
@@ -1,12 +0,0 @@
-FROM centos:centos7
-RUN yum install -y rpm-build yum-utils
-WORKDIR /src
-COPY mod_authnz_pam.spec .
-RUN yum-builddep -y mod_authnz_pam.spec
-COPY * source/
-RUN rpm -q --qf '%{name}-%{version}\n' --specfile mod_authnz_pam.spec | head -1 > name_version
-RUN mv -v source $( cat name_version )
-RUN mkdir -p ~/rpmbuild/SOURCES
-RUN tar cvzf ~/rpmbuild/SOURCES/$( cat name_version ).tar.gz $( cat name_version )
-RUN rpmbuild -bb --define "dist $( rpm --eval '%{dist}' ).localbuild" mod_authnz_pam.spec
-RUN yum install -y ~/rpmbuild/RPMS/*/$( cat name_version )-*.localbuild.*.rpm
diff --git a/tests/Dockerfile.fedora b/tests/Dockerfile.fedora
deleted file mode 100644
index 21e9d80..0000000
--- a/tests/Dockerfile.fedora
+++ /dev/null
@@ -1,12 +0,0 @@
-FROM registry.fedoraproject.org/fedora
-RUN dnf install -y rpm-build 'dnf-command(builddep)'
-WORKDIR /src
-COPY mod_authnz_pam.spec .
-RUN dnf builddep -y mod_authnz_pam.spec
-COPY * source/
-RUN rpm -q --qf '%{name}-%{version}\n' --specfile mod_authnz_pam.spec | head -1 > name_version
-RUN mv -v source $( cat name_version )
-RUN mkdir -p ~/rpmbuild/SOURCES
-RUN tar cvzf ~/rpmbuild/SOURCES/$( cat name_version ).tar.gz $( cat name_version )
-RUN rpmbuild -bb --define "dist $( rpm --eval '%{dist}' ).localbuild" mod_authnz_pam.spec
-RUN dnf install -y ~/rpmbuild/RPMS/*/$( cat name_version )-*.localbuild.*.rpm
diff --git a/tests/build.sh b/tests/build.sh
new file mode 100755
index 0000000..fa3d28d
--- /dev/null
+++ b/tests/build.sh
@@ -0,0 +1,24 @@
+#!/bin/bash
+
+set -e
+set -x
+
+DNF=yum
+BUILDDEP_PROVIDER=yum-utils
+BUILDDEP=yum-builddep
+if type dnf 2> /dev/null ; then
+	DNF=dnf
+	BUILDDEP_PROVIDER='dnf-command(builddep)'
+	BUILDDEP='dnf builddep'
+fi
+
+$DNF install -y rpm-build "$BUILDDEP_PROVIDER"
+$BUILDDEP -y mod_authnz_pam.spec
+NAME_VERSION=$( rpm -q --qf '%{name}-%{version}\n' --specfile mod_authnz_pam.spec | head -1 )
+mkdir .$NAME_VERSION
+cp -rp * .$NAME_VERSION
+mv .$NAME_VERSION $NAME_VERSION
+mkdir -p ~/rpmbuild/SOURCES
+tar cvzf ~/rpmbuild/SOURCES/$NAME_VERSION.tar.gz $NAME_VERSION
+rpmbuild -bb --define "dist $( rpm --eval '%{dist}' ).localbuild" mod_authnz_pam.spec
+$DNF install -y ~/rpmbuild/RPMS/*/$NAME_VERSION-*.localbuild.*.rpm