diff options
| -rw-r--r-- | .copr/prepare.sh | 2 | ||||
| -rw-r--r-- | .papr.yml | 13 | ||||
| -rw-r--r-- | contrib/build_rpm.sh | 23 | ||||
| -rw-r--r-- | contrib/spec/podman.spec.in | 7 |
4 files changed, 36 insertions, 9 deletions
diff --git a/.copr/prepare.sh b/.copr/prepare.sh index 197336a68..2ba34a7b8 100644 --- a/.copr/prepare.sh +++ b/.copr/prepare.sh @@ -19,4 +19,4 @@ sed "s,#COMMIT#,${COMMIT},; contrib/spec/podman.spec.in > contrib/spec/podman.spec mkdir build/ -git archive --prefix "podman-${COMMIT_SHORT}/" --format "tar.gz" HEAD -o "build/libpod-${COMMIT_SHORT}.tar.gz" +git archive --prefix "libpod-${COMMIT_SHORT}/" --format "tar.gz" HEAD -o "build/libpod-${COMMIT_SHORT}.tar.gz" @@ -54,10 +54,6 @@ host: specs: ram: 8192 cpus: 4 -extra-repos: - - name: crio_copr - baseurl: https://copr-be.cloud.fedoraproject.org/results/baude/Upstream_CRIO_Family/fedora-28-x86_64/ - gpgcheck: 0 packages: - podman - buildah @@ -69,3 +65,12 @@ required: false timeout: 90m context: "Fedora fedora/28/cloud Podman" + +--- + +container: + image: registry.fedoraproject.org/fedora:28 +tests: + - sh contrib/build_rpm.sh +required: true +context: "RPM regressions" diff --git a/contrib/build_rpm.sh b/contrib/build_rpm.sh new file mode 100644 index 000000000..8bcd4b87e --- /dev/null +++ b/contrib/build_rpm.sh @@ -0,0 +1,23 @@ +#!/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 \ + python3-varlink \ + go-compilers-golang-compiler + +make -f .copr/Makefile +rpmbuild --rebuild podman-*.src.rpm diff --git a/contrib/spec/podman.spec.in b/contrib/spec/podman.spec.in index e70bdcaec..9f1c4d011 100644 --- a/contrib/spec/podman.spec.in +++ b/contrib/spec/podman.spec.in @@ -39,7 +39,6 @@ Summary: Manage Pods, Containers and Container Images License: ASL 2.0 URL: %{git_podman} Source0: %{git0}/archive/%{commit0}/%{repo}-%{shortcommit0}.tar.gz -Patch0: makefile.patch # e.g. el6 has ppc64 arch without gcc-go, so EA tag is required #ExclusiveArch: %%{?go_arches:%%{go_arches}}%%{!?go_arches:%%{ix86} x86_64 aarch64 %%{arm}} ExclusiveArch: aarch64 %{arm} ppc64le s390x x86_64 @@ -364,7 +363,7 @@ providing packages with %{import_path} prefix. %endif %prep -%autosetup -Sgit -n %{repo}-%{commit0} +%autosetup -Sgit -n %{repo}-%{shortcommit0} sed -i '/\/bin\/env/d' completions/bash/%{name} sed -i 's/0.0.0/%{version}/' contrib/python/%{name}/setup.py sed -i 's/0.0.0/%{version}/' contrib/python/py%{name}/setup.py @@ -476,8 +475,8 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath} %{_datadir}/bash-completion/completions/* %config(noreplace) %{_sysconfdir}/cni/net.d/87-%{name}-bridge.conflist %{_datadir}/containers/%{repo}.conf -%{_unitdir}/io.%{project}.%{name}.service -%{_unitdir}/io.%{project}.%{name}.socket +%{_unitdir}/io.podman.service +%{_unitdir}/io.podman.socket %{_usr}/lib/tmpfiles.d/%{name}.conf %if %{with varlink} |