From 818521ee773b5f2036ba7453e659f801a8aaae76 Mon Sep 17 00:00:00 2001
From: Ian Wienand <iwienand@redhat.com>
Date: Wed, 1 Feb 2023 11:35:45 +1100
Subject: [PATCH] zuul-jobs-test-registry-docker-* : update to jammy nodes

This is currently failing as buildx is incomaptible with the old
version of skopeo.

Switch to jammy nodes and install an updated skopeo for testing.

Change-Id: I40b9134200bcbbbe469acab3aedbea2eaf4c0f14
---
 test-playbooks/registry/test-registry-pre.yaml | 12 +++++++-----
 zuul-tests.d/container-roles-jobs.yaml         | 12 ++++++------
 2 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/test-playbooks/registry/test-registry-pre.yaml b/test-playbooks/registry/test-registry-pre.yaml
index 8dcc31add..596199360 100644
--- a/test-playbooks/registry/test-registry-pre.yaml
+++ b/test-playbooks/registry/test-registry-pre.yaml
@@ -34,15 +34,17 @@
 
 - hosts: executor
   name: Set up a simulated executor
-  roles:
-    - name: ensure-package-repositories
-      repositories_list:
-        - repo: ppa:projectatomic/ppa
   tasks:
     - name: Install packages
       become: true
       package:
         name:
           - socat
-          - skopeo
         state: present
+
+    # NOTE(ianw) 2023-02-03 : we need a later version for buildx
+    - name: Install skopeo
+      include_role:
+        name: ensure-skopeo
+      vars:
+        ensure_skopeo_install_from_upstream: true
diff --git a/zuul-tests.d/container-roles-jobs.yaml b/zuul-tests.d/container-roles-jobs.yaml
index 2f64a60b2..f7cccc6ce 100644
--- a/zuul-tests.d/container-roles-jobs.yaml
+++ b/zuul-tests.d/container-roles-jobs.yaml
@@ -192,11 +192,11 @@
     nodeset:
       nodes:
         - name: intermediate-registry
-          label: ubuntu-bionic
+          label: ubuntu-jammy
         - name: executor
-          label: ubuntu-bionic
+          label: ubuntu-jammy
         - name: builder
-          label: ubuntu-bionic
+          label: ubuntu-jammy
 
 - job:
     name: zuul-jobs-test-registry-docker-multiarch
@@ -223,11 +223,11 @@
     nodeset:
       nodes:
         - name: intermediate-registry
-          label: ubuntu-bionic
+          label: ubuntu-jammy
         - name: executor
-          label: ubuntu-bionic
+          label: ubuntu-jammy
         - name: builder
-          label: ubuntu-bionic
+          label: ubuntu-jammy
 
 - job:
     name: zuul-jobs-test-registry-podman