From 1e64308467785f5b7cf978169bfa328e97bf27cd Mon Sep 17 00:00:00 2001
From: Lokesh Mandvekar <lsm5@fedoraproject.org>
Date: Mon, 21 Feb 2022 16:31:45 -0500
Subject: [PATCH] containers-common-1-27.el8

- do not specify infra_image in containers.conf
- needed to resolve gating test failures
- Related: #2000051

Signed-off-by: Lokesh Mandvekar <lsm5@fedoraproject.org>
---
 containers-common.spec | 11 ++++++++---
 containers.conf        |  1 -
 update.sh              |  2 --
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/containers-common.spec b/containers-common.spec
index 909da00..389425c 100644
--- a/containers-common.spec
+++ b/containers-common.spec
@@ -12,7 +12,7 @@
 Epoch: 2
 Name: containers-common
 Version: 1
-Release: 26%{?dist}
+Release: 27%{?dist}
 Summary: Common configuration and documentation for containers
 License: ASL 2.0
 BuildRequires: /usr/bin/go-md2man
@@ -79,7 +79,7 @@ separately.
 
 %package -n aardvark-dns
 Version: 1.0.0
-Release: 24%{?dist}
+Release: 27%{?dist}
 URL: https://github.com/containers/aardvark-dns
 Summary: Authoritative DNS server for A/AAAA container records
 License: ASL 2.0 and BSD and MIT
@@ -98,7 +98,7 @@ Read more about configuration in `src/backend/mod.rs`.
 
 %package -n netavark
 Version: 1.0.0
-Release: 24%{?dist}
+Release: 27%{?dist}
 URL: https://github.com/containers/netavark
 Summary: OCI network stack
 License: ASL 2.0 and BSD and MIT
@@ -258,6 +258,11 @@ EOF
 %{_mandir}/man1/netavark.1*
 
 %changelog
+* Mon Feb 21 2022 Lokesh Mandvekar <lsm5@redhat.com> - 2:1-27
+- do not specify infra_image in containers.conf
+- needed to resolve gating test failures
+- Related: #2000051
+
 * Sat Feb 19 2022 Lokesh Mandvekar <lsm5@redhat.com> - 2:1-26
 - aardvark-dns built for same arches as netavark
 - Related: #2000051
diff --git a/containers.conf b/containers.conf
index 5961d59..50ef1b7 100644
--- a/containers.conf
+++ b/containers.conf
@@ -405,7 +405,6 @@ default_sysctls = [
 # specify an image to pull.
 #
 #infra_image = ""
-infra_image = "registry.access.redhat.com/ubi8/pause"
 
 # Specify the locking mechanism to use; valid values are "shm" and "file".
 # Change the default only if you are sure of what you are doing, in general
diff --git a/update.sh b/update.sh
index 36d027f..6a57556 100755
--- a/update.sh
+++ b/update.sh
@@ -27,7 +27,6 @@ if pwd | grep rhel-8 > /dev/null
 then
 ensure registries.conf unqualified-search-registries [\"registry.fedoraproject.org\",\ \"registry.access.redhat.com\",\ \"registry.centos.org\",\ \"docker.io\"]
 ensure registries.conf short-name-mode               \"permissive\"
-ensure containers.conf infra_image                   \"registry.access.redhat.com/ubi8/pause\"
 ensure containers.conf runtime                       \"runc\"
 ensure containers.conf events_logger                 \"file\"
 ensure containers.conf log_driver                    \"k8s-file\"
@@ -35,7 +34,6 @@ ensure containers.conf network_backend               \"cni\"
 else
 ensure registries.conf unqualified-search-registries [\"registry.fedoraproject.org\",\ \"registry.access.redhat.com\",\ \"registry.centos.org\",\ \"quay.io\",\ \"docker.io\"]
 ensure registries.conf short-name-mode               \"enforcing\"
-ensure containers.conf infra_image                   \"registry.access.redhat.com/ubi8/pause\"
 ensure containers.conf runtime                       \"crun\"
 fi
 [ `grep "keyctl" seccomp.json | wc -l` == 0 ] && sed -i '/\"kill\",/i \