From 54b7e8664da55d0bdd68725b2a783888fda914fe Mon Sep 17 00:00:00 2001
From: Jan Pazdziora <jpazdziora@redhat.com>
Date: Mon, 16 Jul 2018 21:48:13 +0200
Subject: Build rpm in Cirrus CI, use the same tests/build.sh for Travis CI.

---
 tests/Dockerfile        |  4 ++++
 tests/Dockerfile.centos | 12 ------------
 tests/Dockerfile.fedora | 12 ------------
 tests/build.sh          | 24 ++++++++++++++++++++++++
 4 files changed, 28 insertions(+), 24 deletions(-)
 create mode 100644 tests/Dockerfile
 delete mode 100644 tests/Dockerfile.centos
 delete mode 100644 tests/Dockerfile.fedora
 create mode 100755 tests/build.sh

(limited to 'tests')

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
-- 
cgit