From 97106d0b8a8dad99478803612b04a4a8cf87667b Mon Sep 17 00:00:00 2001
From: Matt Anson <matta@stackhpc.com>
Date: Mon, 22 Jan 2024 16:58:00 +0000
Subject: [PATCH 1/2] Separate repos for Docker CE Ubuntu Jammy/Focal

---
 .../inventory/group_vars/all/package-repos    | 25 +++++++++++++++----
 1 file changed, 20 insertions(+), 5 deletions(-)

diff --git a/ansible/inventory/group_vars/all/package-repos b/ansible/inventory/group_vars/all/package-repos
index 3568e1ab..d5b89628 100644
--- a/ansible/inventory/group_vars/all/package-repos
+++ b/ansible/inventory/group_vars/all/package-repos
@@ -98,17 +98,32 @@ deb_package_repos:
     distribution_name: ubuntu-jammy-security-
 
   # Third-party repositories
-  - name: Docker CE for Ubuntu
+
+  ## Separate repositories for each distribution because
+  ## https://github.com/pulp/pulp_deb/issues/921
+  - name: Docker CE for Ubuntu Focal
+    url: https://download.docker.com/linux/ubuntu
+    policy: immediate
+    architectures: amd64
+    distributions: focal
+    components: stable
+    mirror: true
+    mode: verbatim
+    base_path: docker-ce/ubuntu-focal/
+    short_name: docker_ce_ubuntu_focal
+    distribution_name: docker-ce-for-ubuntu-focal-
+
+  - name: Docker CE for Ubuntu Jammy
     url: https://download.docker.com/linux/ubuntu
     policy: immediate
     architectures: amd64
-    distributions: focal jammy
+    distributions: jammy
     components: stable
     mirror: true
     mode: verbatim
-    base_path: docker-ce/ubuntu/
-    short_name: docker_ce_ubuntu
-    distribution_name: docker-ce-for-ubuntu-
+    base_path: docker-ce/ubuntu-jammy/
+    short_name: docker_ce_ubuntu_jammy
+    distribution_name: docker-ce-for-ubuntu-jammy-
 
 # Default filter string for Deb package repositories.
 deb_package_repo_filter: ""

From c5d3b86d6f415f597321e7957e6fa0998569645a Mon Sep 17 00:00:00 2001
From: Matt Anson <matta@stackhpc.com>
Date: Mon, 22 Jan 2024 17:09:56 +0000
Subject: [PATCH 2/2] Fix CI tests

---
 ansible/validate-deb-repos.yml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/ansible/validate-deb-repos.yml b/ansible/validate-deb-repos.yml
index ca109bbb..88d5924c 100644
--- a/ansible/validate-deb-repos.yml
+++ b/ansible/validate-deb-repos.yml
@@ -58,18 +58,18 @@
       assert:
         that:
           - deb_package_repos_filtered | length == 1
-          - deb_package_repos_filtered[0].short_name == 'ubuntu_focal'
+          - deb_package_repos_filtered[0].short_name == 'ubuntu_jammy_security'
       vars:
-        deb_package_repo_filter: ubuntu_focal$
+        deb_package_repo_filter: ubuntu_jammy_security$
 
     - name: Assert that Deb package repository list can be filtered to multiple
       assert:
         that:
           - deb_package_repos_filtered | length == 2
-          - deb_package_repos_filtered[0].short_name == 'ubuntu_focal'
-          - deb_package_repos_filtered[1].short_name == 'docker_ce_ubuntu'
+          - deb_package_repos_filtered[0].short_name == 'ubuntu_jammy_security'
+          - deb_package_repos_filtered[1].short_name == 'docker_ce_ubuntu_jammy'
       vars:
-        deb_package_repo_filter: docker_ce_ubuntu ubuntu_focal$
+        deb_package_repo_filter: docker_ce_ubuntu_jammy ubuntu_jammy_security$
 
     - name: Assert that dev package repository list is defined
       assert: