Podman tests now require buildah

PR #7891 introduced a way for podman-rm to remove external containers; to test it, we need buildah. Signed-off-by: Ed Santiago <santiago@redhat.com> (cherry picked from commit fee6ccac12) Signed-off-by: Lokesh Mandvekar <lsm5@fedoraproject.org>
podman-2:2.1.1-3
2020-10-19 13:52:32 -04:00 · 2020-09-30 15:41:57 -04:00 · 2020-09-30 14:45:41 -04:00 · 2020-09-25 21:13:06 +00:00 · 2020-09-22 15:40:19 -04:00 · 2020-09-22 15:33:27 -04:00
7 changed files with 525 additions and 111 deletions
--- a/.gitignore
+++ b/.gitignore
@ -384,3 +384,53 @@
 /libpod-f634fd3.tar.gz
 /libpod-c48243e.tar.gz
 /libpod-031437b.tar.gz
+/libpod-7a859f0.tar.gz
+/libpod-ce64c14.tar.gz
+/libpod-0005792.tar.gz
+/libpod-ca5ff03.tar.gz
+/libpod-9181c65.tar.gz
+/libpod-b02b072.tar.gz
+/libpod-a2fdb6e.tar.gz
+/libpod-233d95f.tar.gz
+/libpod-4d653f0.tar.gz
+/libpod-f3ffda1.tar.gz
+/dnsname-f5af33d.tar.gz
+/libpod-7bbef41.tar.gz
+/libpod-9090c47.tar.gz
+/libpod-b7ce115.tar.gz
+/v1.8.0-rc1.tar.gz
+/v1.8.0.tar.gz
+/v1.8.1-rc1.tar.gz
+/v1.8.1-rc2.tar.gz
+/v1.8.1-rc3.tar.gz
+/v1.8.1-rc4.tar.gz
+/v1.8.1.tar.gz
+/v1.8.2-rc1.tar.gz
+/v1.8.2.tar.gz
+/v1.9.0-rc1.tar.gz
+/v1.9.0-rc2.tar.gz
+/v1.9.0.tar.gz
+/v1.9.1.tar.gz
+/libpod-5b4e91d.tar.gz
+/v1.9.2.tar.gz
+/v1.9.3.tar.gz
+<<<<<<< HEAD
+=======
+/v2.0.0-rc4.tar.gz
+/v2.0.0-rc5.tar.gz
+/v2.0.0-rc6.tar.gz
+/v2.0.0-rc7.tar.gz
+/v2.0.0.tar.gz
+/libpod-6bc5dcc.tar.gz
+/v2.0.1.tar.gz
+>>>>>>> 742c782... podman-2:2.0.1-1
+/v2.0.2.tar.gz
+/v2.0.3.tar.gz
+/v2.0.4.tar.gz
+/v2.0.5.tar.gz
+/v2.0.6-rc1.tar.gz
+/v2.0.6.tar.gz
+/v2.1.0-rc1.tar.gz
+/v2.1.0-rc2.tar.gz
+/v2.1.0.tar.gz
+/v2.1.1.tar.gz
--- a/gating-test-crun.patch
+++ b/gating-test-crun.patch
@ -0,0 +1,33 @@
+From f732e2edcb5a1b925aa2bea65bfe1162edec032e Mon Sep 17 00:00:00 2001
+From: Ed Santiago <santiago@redhat.com>
+Date: Tue, 29 Sep 2020 06:20:21 -0600
+Subject: [PATCH] Gating-test fix: deal with new crun error msg
+
+crun changed an error message:
+
+   https://github.com/containers/crun/pull/439
+
+It's a good change, absolutely the right thing to do, but
+it broke gating tests. Fix tests so they handle both old
+and new format.
+
+Fixes: #7814
+
+Signed-off-by: Ed Santiago <santiago@redhat.com>
+---
+ test/system/030-run.bats | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/test/system/030-run.bats b/test/system/030-run.bats
+index 4a286d3ae1..b3599cc173 100644
+--- a/test/system/030-run.bats
+++ b/test/system/030-run.bats
+@@ -14,7 +14,7 @@ load helpers
+     # ...but check the configured runtime engine, and switch to crun as needed
+     run_podman info --format '{{ .Host.OCIRuntime.Path }}'
+     if expr "$output" : ".*/crun"; then
+-        err_no_such_cmd="Error: executable file not found in \$PATH: No such file or directory: OCI runtime command not found error"
+        err_no_such_cmd="Error: executable file.* not found in \$PATH: No such file or directory: OCI runtime command not found error"
+         err_no_exec_dir="Error: open executable: Operation not permitted: OCI runtime permission denied error"
+     fi
+ 
--- a/gating.yaml
+++ b/gating.yaml
@ -0,0 +1,6 @@
+--- !Policy
+product_versions:
+  - fedora-*
+decision_context: bodhi_update_push_testing
+rules:
+  - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.tier0.functional}
--- a/podman.spec
+++ b/podman.spec
@ -1,17 +1,21 @@
 %global with_devel 0
 %global with_bundled 1
-%global with_debug 1
 %global with_check 0
 %global with_unit_test 0

-%if 0%{?fedora}
+%if 0%{?fedora} || 0%{?centos} >= 8
 #### DO NOT REMOVE - NEEDED FOR CENTOS
 %bcond_without varlink
-%define gogenerate go generate
 %else
 %bcond_with varlink
 %endif

+%if 0%{?fedora}
+%global with_debug 1
+%else
+%global with_debug 0
+%endif
+
 %if 0%{?with_debug}
 %global _find_debuginfo_dwz_opts %{nil}
 %global _dwz_low_mem_die_limit 0
@ -19,75 +23,94 @@
 %global debug_package %{nil}
 %endif

-%global provider github
-%global provider_tld com
-%global project containers
-%global repo libpod
-# https://github.com/containers/libpod
-%global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo}
-%global import_path %{provider_prefix}
-%global git0 https://%{provider}.%{provider_tld}/%{project}/%{repo}
-%global commit0 031437bf5b19b5121224cdec301dd9945f38e610
-%global shortcommit0 %(c=%{commit0}; echo ${c:0:7})
+%if ! 0%{?gobuild:1}
+%define gobuild(o:) GO111MODULE=off go build -buildmode pie -compiler gc -tags="rpm_crashtraceback ${BUILDTAGS:-}" -ldflags "${LDFLAGS:-} -B 0x$(head -c20 /dev/urandom|od -An -tx1|tr -d ' \\n') -extldflags '-Wl,-z,relro -Wl,-z,now -specs=/usr/lib/rpm/redhat/redhat-hardened-ld '" -a -v -x %{?**};
+%endif
+%define gogenerate go generate

-%global import_path_conmon github.com/containers/conmon
-%global git_conmon https://%{import_path_conmon}
-%global commit_conmon e217fdff82e0b1a6184a28c43043a4065083407f
-%global shortcommit_conmon %(c=%{commit_conmon}; echo ${c:0:7})
+%define provider github
+%define provider_tld com
+%define project containers
+%define repo %{name}
+# https://github.com/containers/libpod
+%define import_path %{provider}.%{provider_tld}/%{project}/%{repo}
+%define git0 https://%{import_path}
+
+%define repo_plugins dnsname
+# https://github.com/containers/libpod
+%define import_path_plugins %{provider}.%{provider_tld}/%{project}/%{repo_plugins}
+%define git_plugins https://github.com/containers/dnsname
+%define commit_plugins f5af33dedcfc5e707e5560baa4a72f8d96a968fe
+%define shortcommit_plugins %(c=%{commit_plugins}; echo ${c:0:7})

 # Used for comparing with latest upstream tag
 # to decide whether to autobuild (non-rawhide only)
-%global built_tag v1.4.4
+%define built_tag v2.1.1
+%define built_tag_strip %(b=%{built_tag}; echo ${b:1})
+%define download_url %{git0}/archive/%{built_tag}.tar.gz

 Name: podman
 %if 0%{?fedora}
 Epoch: 2
+%else
+Epoch: 0
 %endif
-Version: 1.5.1
-# Rawhide almost always ships unreleased builds,
-# so release tag should be of the form 0.N.blahblah
-Release: 0.14.dev.git%{shortcommit0}%{?dist}
+Version: 2.1.1
+# RELEASE TAG SHOULD ALWAYS BEGIN WITH A NUMBER
+# N.foo if released, 0.N.foo if unreleased
+Release: 3%{?dist}
 Summary: Manage Pods, Containers and Container Images
 License: ASL 2.0
 URL: https://%{name}.io/
-Source0: %{git0}/archive/%{commit0}/%{repo}-%{shortcommit0}.tar.gz
-Source1: %{git_conmon}/archive/%{commit_conmon}/conmon-%{shortcommit_conmon}.tar.gz
+Source0: %{download_url}
+# To build a random user's fork/commit, comment out above line,
+# uncomment below Source0, and replace the placeholders with the right info
+# Also, adjust %%prep section as necessary.
+#Source0: https://github.com/$GITHUB_USER/$GITHUB_USER_REPO/archive/$BRANCH.tar.gz
+Source1: https://github.com/containers/dnsname/archive/f5af33dedcfc5e707e5560baa4a72f8d96a968fe/dnsname-f5af33d.tar.gz
+Patch0: gating-test-crun.patch
+Provides: %{name}-manpages = %{epoch}:%{version}-%{release}
+Obsoletes: %{name}-manpages < %{epoch}:%{version}-%{release}
 # If go_compiler is not set to 1, there is no virtual provide. Use golang instead.
-BuildRequires: %{?go_compiler:compiler(go-compiler)}%{!?go_compiler:golang}
-BuildRequires: btrfs-progs-devel
+BuildRequires: golang
 BuildRequires: glib2-devel
 BuildRequires: glibc-devel
 BuildRequires: glibc-static
 BuildRequires: git
-BuildRequires: golang-github-cpuguy83-md2man
+BuildRequires: go-md2man
 BuildRequires: gpgme-devel
 BuildRequires: libassuan-devel
 BuildRequires: libgpg-error-devel
 BuildRequires: libseccomp-devel
 BuildRequires: libselinux-devel
-BuildRequires: ostree-devel
 BuildRequires: pkgconfig
 BuildRequires: make
 BuildRequires: systemd
 BuildRequires: systemd-devel
-Requires: runc >= 2:1.0.0-57
 Requires: containers-common
-Requires: containernetworking-plugins >= 0.7.5-1
+Requires: containernetworking-plugins >= 0.8.6-1
 Requires: iptables
 Requires: nftables
-# #1686813 - conmon hasn't been made independent yet
-#Requires: conmon
+Requires: conmon >= 2:2.0.18-1
+Requires: %{name}-plugins = %{epoch}:%{version}-%{release}
+Obsoletes: oci-systemd-hook <= 0.2.0-3
 %if 0%{?fedora}
-Recommends: %{name}-manpages = %{epoch}:%{version}-%{release}
-Recommends: container-selinux
-Recommends: slirp4netns >= 0.3.0-2
+BuildRequires: btrfs-progs-devel
+BuildRequires: ostree-devel
 Recommends: fuse-overlayfs >= 0.3-8
+Requires: crun >= 0.15-4
+Recommends: libvarlink-util
+%endif
+%if 0%{?fedora} || 0%{?centos} >= 8
+Recommends: catatonit
+Recommends: container-selinux
+Recommends: runc
+Recommends: slirp4netns >= 0.3.0-2
 %else
-#### DO NOT REMOVE - NEEDED FOR CENTOS
-Requires: %{name}-manpages = %{version}-%{release}
+Requires: catatonit
 Requires: container-selinux
+Requires: runc
 Requires: slirp4netns >= 0.3.0-2
-Requires: runc >= 1.0.0-57
 %endif

 # vendored libraries
@ -197,12 +220,15 @@ Provides: bundled(golang(k8s.io/utils)) = 258e2a2fa64568210fbd6267cf1d8fd87c3cb8
 daemonless tool.  %{name} provides a Docker-CLI comparable command line that
 eases the transition from other container engines and allows the management of
 pods, containers and images.  Simply put: alias docker=%{name}.
-Most %{name} commands can be run as a regular user, without requiring additional privileges.
+Most %{name} commands can be run as a regular user, without requiring
+additional privileges.

-%{name} uses Buildah(1) internally to create container images. Both tools share image (not container) storage, hence each can use or manipulate images (but not containers) created by the other.
+%{name} uses Buildah(1) internally to create container images.
+Both tools share image (not container) storage, hence each can use or
+manipulate images (but not containers) created by the other.

 %{summary}
-%{repo} Simple management tool for pods, containers and images
+%{name} is a simple management tool for pods, containers and images

 %package docker
 Summary: Emulate Docker CLI using %{name}
@ -373,28 +399,34 @@ Requires: golang(github.com/urfave/cli)

 %description unit-test-devel
 %{summary}
-libpod provides a library for applications looking to use the Container Pod concept popularized by Kubernetes.
+%{name} provides a library for applications looking to use the
+Container Pod concept popularized by Kubernetes.

 This package contains unit tests for project
 providing packages with %{import_path} prefix.
 %endif

-%if 0%{?fedora}
 %package tests
 Summary: Tests for %{name}

 Requires: %{name} = %{epoch}:%{version}-%{release}
 Requires: bats
 Requires: jq
+Requires: skopeo
+Requires: nmap-ncat
+Requires: httpd-tools
+Requires: openssl
+Requires: socat
+Requires: buildah

 %description tests
 %{summary}

 This package contains system tests for %{name}

+%if 0%{?fedora} || 0%{?centos} >= 8
 %package remote
 Summary: (Experimental) Remote client for managing %{name} containers
-Recommends: %{name}-manpages = %{epoch}:%{version}-%{release}

 %description remote
 Remote client for managing %{name} containers.
@ -407,77 +439,114 @@ manage pods, containers and container images. %{name}-remote supports ssh
 connections as well.
 %endif

-%package manpages
-Summary: Man pages for the %{name} commands
-BuildArch: noarch
+%package plugins
+Summary: Plugins for %{name}
+Requires: dnsmasq

-%files manpages
-%{_mandir}/man1/%{name}*.1*
-
-%description manpages
-Man pages for the %{name} commands
+%description plugins
+This plugin sets up the use of dnsmasq on a given CNI network so
+that Pods can resolve each other by name.  When configured,
+the pod and its IP address are added to a network specific hosts file
+that dnsmasq will read in.  Similarly, when a pod
+is removed from the network, it will remove the entry from the hosts
+file.  Each CNI network will have its own dnsmasq instance.

 %prep
-%autosetup -Sgit -n %{repo}-%{commit0}
-rm -rf docs/containers-mounts.conf.5.md
+%autosetup -Sgit -n %{name}-%{built_tag_strip}
+# If you have replaced Source0 for building a random commit, uncomment
+# comment out the autosetup line above and uncomment below autosetup line
+# Use appropriate value for $BRANCH as in Source0
+#%%autosetup -Sgit -n %%{name}-$BRANCH 

-# untar conmon
+# untar dnsname
 tar zxf %{SOURCE1}

-sed -i 's/install.remote: podman-remote/install.remote:/' Makefile
-sed -i 's/install.bin: podman/install.bin:/' Makefile
-
 %build
+export GO111MODULE=off
+
+# build plugins first cause we don't wanna use podman's buildtags
+pushd dnsname-%{commit_plugins}
+mkdir _build
+pushd _build
+mkdir -p src/%{provider}.%{provider_tld}/%{project}
+ln -s ../../../../ src/%{import_path_plugins}
+popd
+ln -s vendor src
+export GOPATH=$(pwd)/_build:$(pwd)
+%gobuild -o bin/dnsname %{import_path_plugins}/plugins/meta/dnsname
+popd
+
+export GOPATH=$(pwd)/_build:$(pwd)
 mkdir _build
 pushd _build
 mkdir -p src/%{provider}.%{provider_tld}/%{project}
 ln -s ../../../../ src/%{import_path}
 popd
 ln -s vendor src
-export GOPATH=$(pwd)/_build:$(pwd)
-export GO111MODULE=off
-%gogenerate ./cmd/%{name}/varlink/...
+
+%if 0%{?fedora} && ! 0%{?centos}
+%gogenerate ./pkg/varlink/...
+%endif

 # build %%{name}
-export BUILDTAGS="systemd varlink seccomp exclude_graphdriver_devicemapper $(hack/btrfs_installed_tag.sh) $(hack/btrfs_tag.sh) $(hack/libdm_tag.sh) $(hack/ostree_tag.sh) $(hack/selinux_tag.sh)"
-%gobuild -o bin/%{name} %{import_path}/cmd/%{name}
-
-%if 0%{?fedora}
-#### DO NOT REMOVE - NEEDED FOR CENTOS
-# build %%{name}-remote
-export BUILDTAGS="remoteclient systemd varlink seccomp exclude_graphdriver_devicemapper $(hack/btrfs_installed_tag.sh) $(hack/btrfs_tag.sh) $(hack/libdm_tag.sh) $(hack/ostree_tag.sh) $(hack/selinux_tag.sh)"
-%gobuild -o bin/%{name}-remote %{import_path}/cmd/%{name}
-%endif 
-
-# build conmon
-pushd conmon-%{commit_conmon}
-%{__make} all
-popd
-
-%install
-install -dp %{buildroot}%{_unitdir}
-PODMAN_VERSION=%{version} %{__make} PREFIX=%{buildroot}%{_prefix} ETCDIR=%{buildroot}%{_sysconfdir} \
-        install.bin \
-%if 0%{?fedora}
-        install.remote \
+export BUILDTAGS="systemd seccomp exclude_graphdriver_devicemapper $(hack/btrfs_installed_tag.sh) $(hack/btrfs_tag.sh) $(hack/libdm_tag.sh) $(hack/ostree_tag.sh) $(hack/selinux_tag.sh)"
+%if 0%{?fedora} && ! 0%{?centos}
+export BUILDTAGS+=" varlink"
+%endif
+%if 0%{?centos}
+export BUILDTAGS+=" exclude_graphdriver_btrfs containers_image_ostree_stub"
 %endif
-        install.man \
-        install.cni \
-        install.systemd \
-        install.completions \
-        install.docker

+# build date. FIXME: Makefile uses '/v2/libpod', that doesn't work here?
+LDFLAGS="-X %{import_path}/libpod/define.buildInfo=$(date +%s)"
+
+%gobuild -o bin/%{name} %{import_path}/cmd/%{name}
+	
+%if 0%{?fedora} || 0%{?centos} >= 8
+# build %%{name}-remote
+export BUILDTAGS+=" exclude_graphdriver_btrfs btrfs_noversion remote"
+%gobuild -o bin/%{name}-remote %{import_path}/cmd/%{name}
+%endif
+	
+%{__make} docs
+	
+%install
+rm -rf docs/containers-mounts.conf.5.md
+
+PODMAN_VERSION=%{version} %{__make} PREFIX=%{buildroot}%{_prefix} \
+               ETCDIR=%{buildroot}%{_sysconfdir} \
+%if 0%{?fedora} && ! 0%{?centos}
+               BUILDTAGS="varlink" \
+%endif
+               install.bin-nobuild \
+%if 0%{?fedora} || 0%{?centos} >= 8
+               install.remote-nobuild \
+%endif
+               install.man-nobuild \
+               install.cni \
+               install.systemd \
+               install.completions \
+               install.docker
+ 
 mv pkg/hooks/README.md pkg/hooks/README-hooks.md

-# install libpod.conf
-install -dp %{buildroot}%{_datadir}/containers
-install -p -m 644 %{repo}.conf %{buildroot}%{_datadir}/containers
-
-# install conmon
-pushd conmon-%{commit_conmon}
-%{__make} LIBEXECDIR=%{buildroot}%{_libexecdir} install.%{name}
+# install plugins
+pushd dnsname-%{commit_plugins}
+%{__make} PREFIX=%{_prefix} DESTDIR=%{buildroot} install
 popd

+# do not include docker and podman-remote man pages in main package
+for file in `find %{buildroot}%{_mandir}/man[15] -type f | sed "s,%{buildroot},," | grep -v -e remote -e docker`; do
+    echo "$file*" >> podman.file-list
+done
+
+# do not install remote manpages on centos7
+%if ! 0%{?fedora} && 0%{?centos} < 8
+rm -rf %{buildroot}%{_mandir}/man1/docker-remote.1
+rm -rf %{buildroot}%{_mandir}/man1/%{name}-remote.1
+rm -rf %{buildroot}%{_mandir}/man5/%{name}-remote.conf.5
+%endif
+
 # source codes for building projects
 %if 0%{?with_devel}
 install -d -p %{buildroot}/%{gopath}/src/%{import_path}/
@ -552,52 +621,300 @@ exit 0
 #define license tag if not already defined
 %{!?_licensedir:%global license %doc}

-%files
+%files -f podman.file-list
 %license LICENSE
-%doc README.md CONTRIBUTING.md pkg/hooks/README-hooks.md install.md code-of-conduct.md transfer.md
+%doc README.md CONTRIBUTING.md pkg/hooks/README-hooks.md install.md transfer.md
 %{_bindir}/%{name}
-%{_mandir}/man5/*.5*
 %{_datadir}/bash-completion/completions/*
 # By "owning" the site-functions dir, we don't need to Require zsh
 %dir %{_datadir}/zsh/site-functions
 %{_datadir}/zsh/site-functions/_%{name}
-%dir %{_libexecdir}/%{name}
-%{_libexecdir}/%{name}/conmon
 %config(noreplace) %{_sysconfdir}/cni/net.d/87-%{name}-bridge.conflist
-%{_datadir}/containers/%{repo}.conf
+%{_unitdir}/%{name}.service
+%{_unitdir}/%{name}.socket
+%{_unitdir}/%{name}-auto-update.service
+%{_unitdir}/%{name}-auto-update.timer
+%{_userunitdir}/%{name}.service
+%{_userunitdir}/%{name}.socket
+%{_userunitdir}/%{name}-auto-update.service
+%{_userunitdir}/%{name}-auto-update.timer
+%if %{with varlink}
 %{_unitdir}/io.%{name}.service
 %{_unitdir}/io.%{name}.socket
-%{_usr}/lib/tmpfiles.d/%{name}.conf
+%{_userunitdir}/io.%{name}.service
+%{_userunitdir}/io.%{name}.socket
+%{_tmpfilesdir}/%{name}.conf
+%endif

 %files docker
 %{_bindir}/docker
 %{_mandir}/man1/docker*.1*
+%{_usr}/lib/tmpfiles.d/%{name}-docker.conf

 %if 0%{?with_devel}
 %files -n libpod-devel -f devel.file-list
 %license LICENSE
-%doc README.md CONTRIBUTING.md pkg/hooks/README-hooks.md install.md code-of-conduct.md transfer.md
+%doc README.md CONTRIBUTING.md pkg/hooks/README-hooks.md install.md transfer.md
 %dir %{gopath}/src/%{provider}.%{provider_tld}/%{project}
 %endif

 %if 0%{?with_unit_test} && 0%{?with_devel}
 %files unit-test-devel -f unit-test-devel.file-list
 %license LICENSE
-%doc README.md CONTRIBUTING.md pkg/hooks/README-hooks.md install.md code-of-conduct.md transfer.md
+%doc README.md CONTRIBUTING.md pkg/hooks/README-hooks.md install.md transfer.md
 %endif

 #### DO NOT REMOVE - NEEDED FOR CENTOS
-%if 0%{?fedora}
+%if 0%{?fedora} || 0%{?centos} >= 8
 %files remote
 %license LICENSE
 %{_bindir}/%{name}-remote
+%{_mandir}/man1/%{name}-remote*.1*
+%endif

 %files tests
 %license LICENSE
-%{_datadir}/%{name}/test
-%endif
+%dir %{_datadir}/%{name}/test
+%dir %{_datadir}/%{name}/test/system
+%{_datadir}/%{name}/test/system/*
+
+%files plugins
+%license dnsname-%{commit_plugins}/LICENSE
+%doc dnsname-%{commit_plugins}/{README.md,README_PODMAN.md}
+%{_libexecdir}/cni/dnsname

 %changelog
+* Wed Sep 30 2020 Lokesh Mandvekar <lsm5@fedoraproject.org> - 2:2.1.1-3
+- fix crun gating test issue
+- bump release tag to preserve upgrade path
+
+* Wed Sep 30 2020 Lokesh Mandvekar <lsm5@fedoraproject.org> - 2:2.1.1-2
+- Require: crun >= 0.15-4
+
+* Wed Sep 30 2020 Lokesh Mandvekar <lsm5@fedoraproject.org> - 2:2.1.1-6
+- fedora Requires: crun-0.15-4
+
+* Wed Sep 30 2020 Lokesh Mandvekar <lsm5@fedoraproject.org> - 2:2.1.1-5
+- fedora requires crun >= 0.15-3
+
+* Sun Sep 27 2020 Lokesh Mandvekar <lsm5@fedoraproject.org> - 2:2.1.1-4
+- correct bad date in changelog
+
+* Sun Sep 27 2020 Lokesh Mandvekar <lsm5@fedoraproject.org> - 2:2.1.1-3
+- adjust deps for centos7
+>>>>>>> 5d1014b... podman-2:2.1.1-7
+
+* Fri Sep 25 2020 RH Container Bot <rhcontainerbot@fedoraproject.org> - 2:2.1.1-1
+- autobuilt v2.1.1
+
+* Tue Sep 22 2020 RH Container Bot <rhcontainerbot@fedoraproject.org> - 2:2.1.0-1
+- autobuilt v2.1.0
+
+* Fri Sep 18 2020 Lokesh Mandvekar <lsm5@fedoraproject.org> - 2:2.1.0-0.4.rc2
+- use correct release tag
+
+* Thu Sep 17 2020 RH Container Bot <rhcontainerbot@fedoraproject.org> - 2:2.1.0-0.3.rc1
+- autobuilt v2.1.0-rc2
+
+* Mon Sep 14 2020 Lokesh Mandvekar <lsm5@fedoraproject.org> - 2:2.1.0-0.2.rc1
+- use correct release tag
+
+* Mon Sep 14 2020 RH Container Bot <rhcontainerbot@fedoraproject.org> - 2:2.1.0-0.1.rc1
+- autobuilt v2.1.0-rc1
+
+* Tue Sep 01 2020 Lokesh Mandvekar <lsm5@fedoraproject.org> - 2:2.0.6-1
+- bump to v2.0.6
+
+* Fri Aug 28 2020 RH Container Bot <rhcontainerbot@fedoraproject.org> - 2:2.0.6-0.2.rc1
+- autobuilt v2.0.6-rc1
+
+* Mon Aug 24 2020 RH Container Bot <rhcontainerbot@fedoraproject.org> - 2:2.0.5-1
+- autobuilt v2.0.5
+
+* Fri Jul 31 21:09:43 GMT 2020 RH Container Bot <rhcontainerbot@fedoraproject.org> - 2:2.0.4-1
+- autobuilt v2.0.4
+
+* Thu Jul 23 17:49:29 GMT 2020 RH Container Bot <rhcontainerbot@fedoraproject.org> - 2:2.0.3-1
+- autobuilt v2.0.3
+
+* Tue Jul 07 2020 RH Container Bot <rhcontainerbot@fedoraproject.org> - 2:2.0.2-1
+- autobuilt v2.0.2
+
+* Fri Jun 26 2020 Lokesh Mandvekar <lsm5@fedoraproject.org> - 2:2.0.1-1
+- bump to v2.0.1
+
+* Sat Jun 20 2020 Lokesh Mandvekar <lsm5@fedoraproject.org> - 2:2.0.0-2
+- depend on conmon-2:2.0.18-1
+
+* Mon Jun 22 2020 Lokesh Mandvekar <lsm5@fedoraproject.org> - 2:2.0.0-1
+- bump to v2.0.0
+
+* Mon May 25 2020 Lokesh Mandvekar <lsm5@fedoraproject.org> - 2:1.9.3-1
+- bump to v1.9.3
+- require conmon >= 2:2.0.16-3
+
+* Fri May 15 2020 Lokesh Mandvekar <lsm5@fedoraproject.org> - 2:1.9.2-2
+- use correct epoch for conmon
+
+* Wed May 13 2020 Lokesh Mandvekar <lsm5@fedoraproject.org> - 2:1.9.2-1
+- bump to v1.9.2
+- update min deps on conmon and cni plugins
+
+* Wed Apr 29 2020 Lokesh Mandvekar <lsm5@fedoraproject.org> - 2:1.9.1-1
+- new version
+
+* Wed Apr 15 2020 RH Container Bot <rhcontainerbot@fedoraproject.org> - 2:1.9.0-1
+- autobuilt v1.9.0
+
+* Tue Apr 14 2020 RH Container Bot <rhcontainerbot@fedoraproject.org> - 2:1.9.0-0.4.rc1
+- autobuilt v1.9.0-rc2
+
+* Mon Apr 13 2020 Lokesh Mandvekar <lsm5@fedoraproject.org> - 2:1.9.0-0.3.rc1
+- correct varlink go generate
+- container-selinux is a recommends for fedora and centos8 but requires for centos7
+
+* Mon Apr 13 2020 RH Container Bot <rhcontainerbot@fedoraproject.org> - 2:1.8.2-0.2.rc1
+- autobuilt v1.9.0-rc1
+
+* Fri Mar 20 2020 Dan Walsh <dwalsh@fedoraproject.org> - 2:1.8.2-2
+- Install the APIV2 services
+
+* Thu Mar 19 2020 RH Container Bot <rhcontainerbot@fedoraproject.org> - 2:1.8.2-1
+- autobuilt v1.8.2
+
+* Wed Mar 18 2020 RH Container Bot <rhcontainerbot@fedoraproject.org> - 2:1.8.1-0.2.rc1
+- autobuilt v1.8.2-rc1
+
+* Wed Mar 11 2020 Lokesh Mandvekar <lsm5@fedoraproject.org> - 2:1.8.1-2
+- bump cause previous release went bad somewhere at fedora-infra
+
+* Wed Mar 11 2020 RH Container Bot <rhcontainerbot@fedoraproject.org> - 2:1.8.1-1
+- autobuilt v1.8.1
+
+* Tue Mar 10 2020 Lokesh Mandvekar <lsm5@fedoraproject.org> - 2:1.8.1-0.7.rc4
+- correct release tag
+
+* Tue Mar 10 2020 RH Container Bot <rhcontainerbot@fedoraproject.org> - 2:1.8.1-0.6.rc3
+- autobuilt v1.8.1-rc4
+
+* Sat Mar 07 2020 Lokesh Mandvekar <lsm5@fedoraproject.org> - 2:1.8.1-0.5.rc3
+- bump to v1.8.1-rc3
+
+* Sun Mar 01 2020 Lokesh Mandvekar <lsm5@fedoraproject.org> - 2:1.8.1-0.4.rc2
+- correct changelog
+
+* Sun Feb 23 2020 Lokesh Mandvekar <lsm5@fedoraproject.org> - 2:1.8.1-0.3.rc1
+- Resolves: #1806147 - correct buildtags for podman-remote
+
+* Fri Feb 21 2020 RH Container Bot <rhcontainerbot@fedoraproject.org> - 2:1.8.1-0.2.rc1
+- autobuilt v1.8.1-rc1
+
+* Sat Feb 08 2020 RH Container Bot <rhcontainerbot@fedoraproject.org> - 2:1.8.0-2
+- bump to v1.8.0
+- autobuilt 2ced909
+
+* Thu Feb 06 2020 Lokesh Mandvekar <lsm5@fedoraproject.org> - 2:1.8.0-0.2
+- bump crun dependency
+
+* Mon Feb 03 2020 Lokesh Mandvekar <lsm5@fedoraproject.org> - 2:1.8.0-0.1
+- built v1.8.0-rc1
+
+* Wed Jan 08 2020 Jindrich Novy <jnovy@redhat.com> - 2:1.7.1-3
+- require container-selinux only when selinux-policy is installed and
+  move podman-remote man pages to dedicated package (#1765818)
+
+* Tue Jan 07 2020 RH Container Bot <rhcontainerbot@fedoraproject.org> - 2:1.7.0-2
+- bump to v1.7.0
+- autobuilt b7ce115
+
+* Tue Jan 07 2020 Jindrich Novy <jnovy@redhat.com> - 2:1.7.0-0.5.rc2
+- merge podman-manpages with podman package
+- require container-selinux (#1765818)
+- minor spec file updates
+
+* Mon Jan 06 2020 Lokesh Mandvekar <lsm5@fedoraproject.org> - 2:1.7.0-0.4.rc2
+- use correct rc tag
+
+* Thu Jan 02 2020 RH Container Bot <rhcontainerbot@fedoraproject.org> - 2:1.7.0-0.3.rc1
+- bump to v1.7.0-rc2
+- autobuilt 9090c47
+
+* Wed Dec 11 2019 RH Container Bot <rhcontainerbot@fedoraproject.org> - 2:1.7.0-0.2.rc1
+- bump to v1.7.0-rc1
+- autobuilt 7bbef41
+
+* Fri Nov 08 2019 Lokesh Mandvekar <lsm5@fedoraproject.org> - 2:1.6.2-4
+- add podman-plugins subpackage
+
+* Wed Oct 30 2019 Lokesh Mandvekar <lsm5@redhat.com> - 1.6.2-3
+- crun only for fedora ATM
+
+* Thu Oct 17 2019 RH Container Bot <rhcontainerbot@fedoraproject.org> - 2:1.6.2-2
+- bump to v1.6.2
+- autobuilt f3ffda1
+
+* Wed Oct 16 2019 RH Container Bot <rhcontainerbot@fedoraproject.org> - 2:1.6.2-0.2.rc1
+- bump to v1.6.2-rc1
+- autobuilt 4d653f0
+
+* Wed Oct 09 2019 Lokesh Mandvekar <lsm5@fedoraproject.org> - 2:1.6.1-5
+- remove polkit dependency for now
+
+* Wed Oct 09 2019 Lokesh Mandvekar <lsm5@fedoraproject.org> - 2:1.6.1-4
+- Requires: crun >= 0.10.2-1 and polkit
+
+* Tue Oct 08 2019 Lokesh Mandvekar <lsm5@fedoraproject.org> - 2:1.6.1-3
+- add Recommends: runc for fedora
+
+* Wed Oct 02 2019 RH Container Bot <rhcontainerbot@fedoraproject.org> - 2:1.6.1-2
+- bump to v1.6.1
+- autobuilt 233d95f
+
+* Wed Oct 02 2019 RH Container Bot <rhcontainerbot@fedoraproject.org> - 2:1.6.1-0.2.rc1
+- bump to v1.6.1-rc1
+- autobuilt a2fdb6e
+
+* Tue Oct 01 2019 Lokesh Mandvekar <lsm5@fedoraproject.org> - 2:1.6.0-4
+- Requires: crun >= 0.10-1
+
+* Tue Oct 01 2019 Lokesh Mandvekar <lsm5@fedoraproject.org> - 2:1.6.0-3
+- bump release tag
+
+* Tue Oct 01 2019 RH Container Bot <rhcontainerbot@fedoraproject.org> - 2:1.6.0-2
+- bump to v1.6.0
+- autobuilt b02b072
+
+* Wed Sep 25 2019 RH Container Bot <rhcontainerbot@fedoraproject.org> - 2:1.6.0-0.2.rc2git9181c65
+- bump to v1.6.0-rc2
+- autobuilt 9181c65
+
+* Tue Sep 17 2019 Lokesh Mandvekar (Bot) <lsm5+bot@fedoraproject.org> - 2:1.6.0-2.gitca5ff03
+- bump to v1.6.0-rc1
+- autobuilt ca5ff03
+
+* Sat Sep 14 2019 Lokesh Mandvekar <lsm5@fedoraproject.org> - 2:1.5.1-3.git0005792
+- use v1.5.1 tag
+- use conmon package as runtime dep
+
+* Fri Sep 13 2019 Daniel J Walsh <dwalsh@redhat.com> - 2:1.5.1-2.18
+- Grab specific version of crun or newer.
+
+* Tue Aug 27 2019 Daniel J Walsh <dwalsh@redhat.com> - 2:1.5.1-2.17
+- Require crun rather then runc
+- Switch to crun by default for cgroupsV2 support
+
+* Thu Aug 22 2019 Daniel J Walsh <dwalsh@redhat.com> - 2:1.5.1-2.16.dev.gitce64c14
+- Move man5 man pages into podman-manpage package
+
+* Tue Aug 13 2019 Dan Walsh <dwalsh@fedoraproject.org> - 2:1.5.1-1.16.dev.gitce64c14
+- Add recommends libvarlink-util
+
+* Tue Aug 13 2019 Lokesh Mandvekar (Bot) <lsm5+bot@fedoraproject.org> - 2:1.5.1-0.16.dev.gitce64c14
+- autobuilt ce64c14
+
+* Tue Aug 13 2019 Lokesh Mandvekar (Bot) <lsm5+bot@fedoraproject.org> - 2:1.5.1-0.15.dev.git7a859f0
+- autobuilt 7a859f0
+
 * Tue Aug 13 2019 Lokesh Mandvekar (Bot) <lsm5+bot@fedoraproject.org> - 2:1.5.1-0.14.dev.git031437b
 - autobuilt 031437b

--- a/4
+++ b/4
@ -1,2 +1,2 @@
-SHA512 (conmon-e217fdf.tar.gz) = aa75e0808e8c6fc535c8b2d8ee106fb8fde6d9ca7f8beb0c51013e83ff161c8005d2427a0366fed89c0d390462852b5a0b12a4e7bf0a44cec654a91328e85c78
-SHA512 (libpod-031437b.tar.gz) = fa811585bb8fbd4d68a21399e3adf68c7c868f1e38545c033acdf448201e666cb95cd260fdaefcab088ad13513199a1d8267d7910dfc91f72dffea2418743ace
+SHA512 (dnsname-f5af33d.tar.gz) = 564555ef83f9bf70560bfdaf864112d62c318b83827400e65d8cbca6deed0813cafdef222c32ada4f596ad60fe4d9753286e65b577a73c85915bd46fc550cadc
+SHA512 (v2.1.1.tar.gz) = 94096aca1816bb1726b74c71a3c3cd50c4c783110c79dd00e851e6292438ccae7b933b6028177039a7d7d96373afcb783f4bc0449a62c18ae97d73767ee3fa26
--- a/tests/test_podman.sh
+++ b/tests/test_podman.sh
@ -3,7 +3,15 @@
 # Simple podman tests
 #

-# Log program versions
-rpm -q podman podman-tests
+# Log program and kernel versions
+echo "Important package versions:"
+(
+    uname -r
+    rpm -qa | egrep 'podman|conmon|crun|runc|iptable|slirp|systemd' | sort
+) | sed -e 's/^/  /'
+
+# Log environment; or at least the useful bits
+echo "Environment:"
+env | grep -v LS_COLORS= | sort | sed -e 's/^/  /'

 bats /usr/share/podman/test/system
--- a/tests/test_podman.yml
+++ b/tests/test_podman.yml
@ -18,5 +18,5 @@
            # running the test with su doesn't create the directory for fedora user on /run/user/
            # so create it manually
            dir: ./
-            run: mkdir /run/user/$(id -u fedora); su -c ${PWD}/test_podman.sh - fedora
+            run: loginctl enable-linger fedora; su -c ${PWD}/test_podman.sh - fedora
            timeout: 15m