Add Ubuntu Jammy repository config in Yoga. (#578)

* Add Ubuntu Jammy repository config

* Updated docs for jammy config

* Docker and UCA repository corrections

* Consolidating repository config in pulp.yml

* Release note for changes

Author: assumptionsandg

doc/source/configuration/release-train.rst

@@ -37,7 +37,12 @@ Configuration
 This configuration provides the following:
 
 * Configuration to deploy a local Pulp service as a container on the seed
+<<<<<<< HEAD
 * Pulp repository definitions for Rocky Linux 9 and Ubuntu Jammy 22.04
+=======
+* Pulp repository definitions for CentOS Stream 8, Rocky Linux 8/9 and Ubuntu
+  Focal/Jammy
+>>>>>>> Add Ubuntu Jammy repository config in Yoga. (#578)
 * Playbooks to synchronise a local Pulp service with Ark
 * Configuration to use the local Pulp repository mirrors on control plane hosts
 * Configuration to use the local Pulp container registry on control plane hosts
@@ -79,6 +84,9 @@ The Ark pulp credentials issued by StackHPC should be configured in
 Package repositories
 --------------------
 
+Rocky Linux 9 and Ubuntu Jammy package repositories are
+synced based on the value of ``os_distribution`` and ``os_release``.
+
 On Ark, each package repository provides versioned snapshots using a datetime
 stamp (e.g. ``20220817T082321``). The current set of tested versions is defined
 in ``etc/kayobe/pulp-repo-versions.yml``. This file is managed by the StackHPC

etc/kayobe/apt.yml

@@ -62,7 +62,6 @@ stackhpc_apt_repositories:
     signed_by: docker.asc
     architecture: amd64
 
-# Disable pulp apt repos on Ubuntu Jammy until they are published.
 apt_repositories: "{{ stackhpc_apt_repositories }}"
 
 # Whether to disable repositories in /etc/apt/sources.list. This may be used

etc/kayobe/pulp.yml

@@ -105,6 +105,23 @@ stackhpc_pulp_deb_repos:
     distributions: "jammy-updates/{{ openstack_release }}"
     required: "{{ stackhpc_pulp_sync_ubuntu_jammy | bool }}"
 
+  # Base Ubuntu Jammy repositories
+  - name: "Ubuntu jammy"
+    url: "{{ stackhpc_release_pulp_content_url }}/ubuntu/jammy/{{ stackhpc_pulp_repo_ubuntu_jammy_version }}"
+    distribution_name: "ubuntu-jammy-"
+    base_path: "ubuntu/jammy/"
+    components: "main restricted universe multiverse"
+    distributions: "jammy jammy-updates jammy-backports"
+    required: "{{ stackhpc_pulp_sync_ubuntu_jammy | bool }}"
+
+  - name: "Ubuntu jammy security"
+    url: "{{ stackhpc_release_pulp_content_url }}/ubuntu/jammy-security/{{ stackhpc_pulp_repo_ubuntu_jammy_security_version }}"
+    distribution_name: "ubuntu-jammy-security-"
+    base_path: "ubuntu/jammy-security/"
+    components: "main restricted universe multiverse"
+    distributions: "jammy-security"
+    required: "{{ stackhpc_pulp_sync_ubuntu_jammy | bool }}"
+
   # Third-party repositories
   - name: "Docker CE for Ubuntu"
     url: "{{ stackhpc_release_pulp_content_url }}/docker-ce/ubuntu/{{ stackhpc_pulp_repo_docker_ce_ubuntu_version }}"

etc/kayobe/stackhpc.yml

@@ -21,6 +21,14 @@ stackhpc_repo_ubuntu_jammy_version: "{{ stackhpc_repo_distribution }}"
 stackhpc_repo_ubuntu_jammy_security_url: "{{ stackhpc_repo_mirror_url }}/pulp/content/ubuntu/jammy-security/{{ stackhpc_repo_ubuntu_jammy_security_version }}"
 stackhpc_repo_ubuntu_jammy_security_version: "{{ stackhpc_repo_distribution }}"
 
+# Ubuntu jammy
+stackhpc_repo_ubuntu_jammy_url: "{{ stackhpc_repo_mirror_url }}/pulp/content/ubuntu/jammy/{{ stackhpc_repo_ubuntu_jammy_version }}"
+stackhpc_repo_ubuntu_jammy_version: "{{ stackhpc_repo_distribution }}"
+
+# Ubuntu jammy security
+stackhpc_repo_ubuntu_jammy_security_url: "{{ stackhpc_repo_mirror_url }}/pulp/content/ubuntu/jammy-security/{{ stackhpc_repo_ubuntu_jammy_security_version }}"
+stackhpc_repo_ubuntu_jammy_security_version: "{{ stackhpc_repo_distribution }}"
+
 # Ubuntu Cloud Archive
 stackhpc_repo_ubuntu_cloud_archive_url: "{{ stackhpc_repo_mirror_url }}/pulp/content/ubuntu-cloud-archive/{{ stackhpc_repo_ubuntu_cloud_archive_version }}"
 stackhpc_repo_ubuntu_cloud_archive_version: "{{ stackhpc_repo_distribution }}"

releasenotes/notes/add-jammy-repo-yoga-f58bfb9792a3c6a7.yaml

@@ -0,0 +1,5 @@
+---
+features:
+  - |
+    Support for Ubuntu 22.04 Jammy Jellyfish
+    repositories have been added to the Yoga Release.