From d2718417e210eb3337730a6dc88df4c47592d062 Mon Sep 17 00:00:00 2001
From: Paul Belanger <pabelanger@redhat.com>
Date: Wed, 2 Dec 2020 12:16:18 -0500
Subject: [PATCH] ensure-podman: Use official podman repos for ubuntu

Reading the installation guide for podman, they reference opensuse.org
as the official package repos for ubuntu:

  https://podman.io/getting-started/installation

Using this repo allows us to pull in much newer version of podman on
ubuntu.  The current PPA package repo hasn't been updated since late
2019.

Change-Id: Ie34419184925a4bcf30422a782e6a238c11f2319
Signed-off-by: Paul Belanger <pabelanger@redhat.com>
---
 roles/ensure-podman/tasks/Ubuntu.yaml              | 11 +++++++++++
 test-playbooks/registry/docker-siblings/Dockerfile |  5 +++--
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/roles/ensure-podman/tasks/Ubuntu.yaml b/roles/ensure-podman/tasks/Ubuntu.yaml
index 7a55fa8cc..5328f36d9 100644
--- a/roles/ensure-podman/tasks/Ubuntu.yaml
+++ b/roles/ensure-podman/tasks/Ubuntu.yaml
@@ -2,8 +2,11 @@
   include_role:
     name: ensure-package-repositories
   vars:
+    repositories_keys:
+      - url: "https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable/xUbuntu_{{ ansible_distribution_version }}/Release.key"
     repositories_list:
       - repo: ppa:projectatomic/ppa
+      - repo: "deb https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable/xUbuntu_{{ ansible_distribution_version }}/ /"
 
 - name: Install podman
   package:
@@ -13,3 +16,11 @@
       - slirp4netns
     state: present
   become: yes
+
+# NOTE(pabelanger): Remove default registries.conf file, so we can manage it
+# ourself. It could have v1 syntax, which doesn't work with v2.
+- name: Remove /etc/containers/registries.conf
+  become: true
+  file:
+    state: absent
+    path: /etc/containers/registries.conf
diff --git a/test-playbooks/registry/docker-siblings/Dockerfile b/test-playbooks/registry/docker-siblings/Dockerfile
index 061d84aec..dcf797db5 100644
--- a/test-playbooks/registry/docker-siblings/Dockerfile
+++ b/test-playbooks/registry/docker-siblings/Dockerfile
@@ -2,8 +2,9 @@ FROM docker.io/upstream/image as first
 ARG ZUUL_SIBLINGS=""
 RUN echo "Zuul siblings: ${ZUUL_SIBLINGS}"
 RUN cp /test-nonce /test-nonce-is-there
-COPY .zuul-siblings/opendev.org/project/fake-sibling/file /target
-COPY .zuul-siblings/openstack.org/project/fake-sibling/file /target
+COPY . /tmp/src
+RUN cp -a /tmp/src/.zuul-siblings/opendev.org/project/fake-sibling/file /target
+RUN cp -a /tmp/src/.zuul-siblings/openstack.org/project/fake-sibling/file /target
 CMD echo "Zuul container test"; sleep infinity
 
 FROM first as second