diff options
| author | baude <bbaude@redhat.com> | 2018-08-27 15:06:22 -0500 |
|---|---|---|
| committer | Atomic Bot <atomic-devel@projectatomic.io> | 2018-08-28 11:53:09 +0000 |
| commit | 9e315518aa52c8cb80b2fae3bd48f6e52e6d0fc0 (patch) | |
| tree | ede6b041a990cdc409e5dbf27a0ee2baefdd1660 /contrib | |
| parent | c33b359ed196102c44ec0b58491d88a7dedd6294 (diff) | |
| download | podman-9e315518aa52c8cb80b2fae3bd48f6e52e6d0fc0.tar.gz podman-9e315518aa52c8cb80b2fae3bd48f6e52e6d0fc0.tar.bz2 podman-9e315518aa52c8cb80b2fae3bd48f6e52e6d0fc0.zip | |
Test RPM build and install for regressions
On Fedora and now Centos (added), we build RPMs based on the spec in
contrib/spec to make sure we protect against regressions when creating
RPMs. Once the RPM is built, we then test actually installing the RPM
to ensure that no deps are missing for install.
Signed-off-by: baude <bbaude@redhat.com>
Closes: #1356
Approved by: rhatdan
Diffstat (limited to 'contrib')
| -rw-r--r-- | contrib/build_rpm.sh | 68 | ||||
| -rw-r--r-- | contrib/spec/podman.spec.in | 2 |
2 files changed, 52 insertions, 18 deletions
diff --git a/contrib/build_rpm.sh b/contrib/build_rpm.sh index 8bcd4b87e..7075e3c79 100644 --- a/contrib/build_rpm.sh +++ b/contrib/build_rpm.sh @@ -1,23 +1,57 @@ #!/bin/bash set -x -dnf -y install device-mapper-devel \ - git \ - glib2-devel \ - glibc-static \ - golang \ - golang-github-cpuguy83-go-md2man \ - gpgme-devel \ - libassuan-devel \ - libseccomp-devel \ - libselinux-devel \ - make \ - ostree-devel \ - golang-github-cpuguy83-go-md2man \ - rpm-build \ - btrfs-progs-devel \ - python3-devel \ + +pkg_manager=`command -v dnf` +if [ -z "$pkg_manager" ]; then + pkg_manager=`command -v yum` +fi + +echo "Package manager binary: $pkg_manager" + + +if [ $pkg_manager == "/usr/bin/yum" ]; then + echo "[virt7-container-common-candidate] +name=virt7-container-common-candidate +baseurl=https://cbs.centos.org/repos/virt7-container-common-candidate/x86_64/os/ +enabled=1 +gpgcheck=0" > /etc/yum.repos.d/container_virt.repo +fi + +declare -a PKGS=(device-mapper-devel \ + git \ + glib2-devel \ + glibc-static \ + golang \ + golang-github-cpuguy83-go-md2man \ + gpgme-devel \ + libassuan-devel \ + libseccomp-devel \ + libselinux-devel \ + make \ + ostree-devel \ + golang-github-cpuguy83-go-md2man \ + rpm-build \ + btrfs-progs-devel \ + go-compilers-golang-compiler \ + ) + +if [ $pkg_manager == "/usr/bin/dnf" ]; then + PKGS+=(python3-devel \ python3-varlink \ - go-compilers-golang-compiler + ) +fi + +echo ${PKGS[*]} +$pkg_manager install -y ${PKGS[*]} make -f .copr/Makefile rpmbuild --rebuild podman-*.src.rpm + +# Test to make sure the install of the binary works +$pkg_manager -y install ~/rpmbuild/RPMS/x86_64/podman-*.x86_64.rpm + + +# If we built python/varlink packages, we should test their installs too +if [ $pkg_manager == "/usr/bin/dnf" ]; then + $pkg_manager -y install ~/rpmbuild/RPMS/noarch/python* +fi diff --git a/contrib/spec/podman.spec.in b/contrib/spec/podman.spec.in index b5b22a3c5..2a6c35306 100644 --- a/contrib/spec/podman.spec.in +++ b/contrib/spec/podman.spec.in @@ -61,7 +61,7 @@ BuildRequires: pkgconfig BuildRequires: make Requires: runc Requires: skopeo-containers -Requires: containernetworking-cni >= 0.6.0-3 +Requires: containernetworking-plugins >= 0.6.0-3 Requires: iptables Requires: oci-systemd-hook %if 0%{?rhel} <= 7 |