From 9429c2f601cc9df70dec67b9f1858c49142f7028 Mon Sep 17 00:00:00 2001
From: Ian Wienand <iwienand@redhat.com>
Date: Fri, 4 Nov 2022 14:01:56 +1100
Subject: [PATCH] ensure-podman/skopeo : update for Jammy

These packages are included in Jammy, so install directly.

We can unpin the buildset registry job so it runs on Jammy now.

Change-Id: I00b269f5924474ac00b56c7695a5c526a9a56046
---
 roles/ensure-podman/tasks/Ubuntu-22.04.yaml | 10 ++++++++++
 roles/ensure-skopeo/tasks/Ubuntu-22.04.yaml |  7 +++++++
 zuul-tests.d/container-roles-jobs.yaml      |  8 --------
 3 files changed, 17 insertions(+), 8 deletions(-)
 create mode 100644 roles/ensure-podman/tasks/Ubuntu-22.04.yaml
 create mode 100644 roles/ensure-skopeo/tasks/Ubuntu-22.04.yaml

diff --git a/roles/ensure-podman/tasks/Ubuntu-22.04.yaml b/roles/ensure-podman/tasks/Ubuntu-22.04.yaml
new file mode 100644
index 000000000..39fd9638e
--- /dev/null
+++ b/roles/ensure-podman/tasks/Ubuntu-22.04.yaml
@@ -0,0 +1,10 @@
+- name: Install podman
+  package:
+    name:
+      - podman
+      - uidmap
+      - slirp4netns
+      - fuse-overlayfs
+      - containernetworking-plugins
+    state: present
+  become: yes
diff --git a/roles/ensure-skopeo/tasks/Ubuntu-22.04.yaml b/roles/ensure-skopeo/tasks/Ubuntu-22.04.yaml
new file mode 100644
index 000000000..4c27227d7
--- /dev/null
+++ b/roles/ensure-skopeo/tasks/Ubuntu-22.04.yaml
@@ -0,0 +1,7 @@
+- name: Install skopeo
+  package:
+    name:
+      - skopeo
+      - uidmap
+    state: present
+  become: yes
diff --git a/zuul-tests.d/container-roles-jobs.yaml b/zuul-tests.d/container-roles-jobs.yaml
index 70f2e5a59..3fdf314e3 100644
--- a/zuul-tests.d/container-roles-jobs.yaml
+++ b/zuul-tests.d/container-roles-jobs.yaml
@@ -223,14 +223,6 @@
     post-run: test-playbooks/registry/test-registry-post.yaml
     vars:
       container_command: docker
-    # NOTE(ianw) 2022-11-07 : Pinned to get
-    #  https://review.opendev.org/c/zuul/zuul-jobs/+/86358
-    # through the gate, but fixed with
-    #  https://review.opendev.org/c/zuul/zuul-jobs/+/863575
-    nodeset:
-      nodes:
-        - name: ubuntu-focal
-          label: ubuntu-focal
 
 - job:
     name: zuul-jobs-test-registry-buildset-registry-k8s-docker