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

@@ -38,7 +38,7 @@ This configuration provides the following:
 
 * Configuration to deploy a local Pulp service as a container on the seed
 * Pulp repository definitions for CentOS Stream 8, Rocky Linux 8/9 and Ubuntu
-  Focal
+  Focal/Jammy
 * 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
@@ -80,14 +80,12 @@ The Ark pulp credentials issued by StackHPC should be configured in
 Package repositories
 --------------------
 
-Currently, Ark does not provide package repositories for Ubuntu Jammy 22.04 -
-only container images.
-
-CentOS Stream 8, Rocky Linux 8/9, and Ubuntu Focal package repositories are
+CentOS Stream 8, Rocky Linux 8/9 and Ubuntu Focal/Jammy package repositories are
 synced based on the value of ``os_distribution`` and ``os_release`` . If you
-need to sync multiple RHEL-like distributions,
-``stackhpc_pulp_sync_centos_stream8``, ``stackhpc_pulp_sync_rocky_8`` and
-``stackhpc_pulp_sync_rocky_9`` in ``etc/kayobe/pulp.yml`` may be set to
+need to sync multiple RHEL-like distributions or Ubuntu releases,
+``stackhpc_pulp_sync_centos_stream8``, ``stackhpc_pulp_sync_rocky_8``
+``stackhpc_pulp_sync_rocky_9``, ``stackhpc_pulp_sync_ubuntu_jammy`` and
+``stackhpc_pulp_sync_ubuntu_focal`` in ``etc/kayobe/pulp.yml`` may be set to
 ``true``.
 
 On Ark, each package repository provides versioned snapshots using a datetime
@@ -99,10 +97,10 @@ repository.
 Package managers
 ----------------
 
-For Ubuntu Focal systems, the package manager configuration is provided by
+For Ubuntu Focal and Jammy systems, the package manager configuration is provided by
 ``stackhpc_apt_repositories`` in ``etc/kayobe/apt.yml``.
 
-The configuration is applied by default to all Ubuntu Focal hosts. The
+The configuration is applied by default to all Ubuntu Focal and Jammy hosts. The
 configuration can be overridden by changing the repository definitions in
 ``apt_repositories`` or toggling ``apt_disable_sources_list`` to use the default
 apt repositories. This can be done on a host-by host basis by defining the

etc/kayobe/apt.yml

@@ -48,11 +48,11 @@ apt_keys:
 #   (optional, default is unset)
 # Default is an empty list.
 stackhpc_apt_repositories:
-  - url: "{{ stackhpc_repo_ubuntu_focal_url }}"
+  - url: "{{ stackhpc_repo_ubuntu_focal_url if ansible_facts.distribution_release == 'focal' else stackhpc_repo_ubuntu_jammy_url }}"
     suites: "{{ ansible_facts.distribution_release }} {{ ansible_facts.distribution_release }}-updates {{ ansible_facts.distribution_release }}-backports"
     components: main restricted universe multiverse
     architecture: amd64
-  - url: "{{ stackhpc_repo_ubuntu_focal_security_url }}"
+  - url: "{{ stackhpc_repo_ubuntu_focal_security_url if ansible_facts.distribution_release == 'focal' else stackhpc_repo_ubuntu_jammy_security_url }}"
     suites: "{{ ansible_facts.distribution_release }}-security"
     components: main restricted universe multiverse
     architecture: amd64
@@ -62,13 +62,12 @@ stackhpc_apt_repositories:
     signed_by: docker.asc
     architecture: amd64
 
-# Disable pulp apt repos on Ubuntu Jammy until they are published.
-apt_repositories: "{{ [] if ansible_facts['distribution_release'] == 'jammy' else stackhpc_apt_repositories }}"
+apt_repositories: "{{ stackhpc_apt_repositories }}"
 
 # Whether to disable repositories in /etc/apt/sources.list. This may be used
 # when replacing the distribution repositories via apt_repositories.
 # Default is false.
-apt_disable_sources_list: "{{ ansible_facts['distribution_release'] != 'jammy' }}"
+apt_disable_sources_list: true
 
 ###############################################################################
 # Dummy variable to allow Ansible to accept this file.

etc/kayobe/environments/ci-aio/stackhpc-ci.yml

@@ -42,6 +42,8 @@ stackhpc_repo_treasuredata_4_version: "{{ stackhpc_pulp_repo_treasuredata_4_vers
 stackhpc_repo_ubuntu_cloud_archive_version: "{{ stackhpc_pulp_repo_ubuntu_cloud_archive_version }}"
 stackhpc_repo_ubuntu_focal_version: "{{ stackhpc_pulp_repo_ubuntu_focal_version }}"
 stackhpc_repo_ubuntu_focal_security_version: "{{ stackhpc_pulp_repo_ubuntu_focal_security_version }}"
+stackhpc_repo_ubuntu_jammy_version: "{{ stackhpc_pulp_repo_ubuntu_jammy_version }}"
+stackhpc_repo_ubuntu_jammy_security_version: "{{ stackhpc_pulp_repo_ubuntu_jammy_security_version }}"
 stackhpc_repo_docker_ce_ubuntu_version: "{{ stackhpc_pulp_repo_docker_ce_ubuntu_version }}"
 stackhpc_repo_centos_stream_9_nfv_openvswitch_version: "{{ stackhpc_pulp_repo_centos_stream_9_nfv_openvswitch_version }}"
 stackhpc_repo_centos_stream_9_openstack_yoga_version: "{{ stackhpc_pulp_repo_centos_stream__openstack_yoga_version }}"

etc/kayobe/environments/ci-builder/stackhpc-ci.yml

@@ -66,6 +66,8 @@ stackhpc_repo_treasuredata_4_version: "{{ stackhpc_pulp_repo_treasuredata_4_vers
 stackhpc_repo_ubuntu_cloud_archive_version: "{{ stackhpc_pulp_repo_ubuntu_cloud_archive_version }}"
 stackhpc_repo_ubuntu_focal_version: "{{ stackhpc_pulp_repo_ubuntu_focal_version }}"
 stackhpc_repo_ubuntu_focal_security_version: "{{ stackhpc_pulp_repo_ubuntu_focal_security_version }}"
+stackhpc_repo_ubuntu_jammy_version: "{{ stackhpc_pulp_repo_ubuntu_jammy_version }}"
+stackhpc_repo_ubuntu_jammy_security_version: "{{ stackhpc_pulp_repo_ubuntu_jammy_security_version }}"
 stackhpc_repo_docker_ce_ubuntu_version: "{{ stackhpc_pulp_repo_docker_ce_ubuntu_version }}"
 stackhpc_repo_centos_stream_9_nfv_openvswitch_version: "{{ stackhpc_pulp_repo_centos_stream_9_nfv_openvswitch_version }}"
 stackhpc_repo_centos_stream_9_openstack_yoga_version: "{{ stackhpc_pulp_repo_centos_stream_9_openstack_yoga_version }}"

etc/kayobe/environments/ci-multinode/stackhpc-ci.yml

@@ -42,6 +42,8 @@ stackhpc_repo_treasuredata_4_version: "{{ stackhpc_pulp_repo_treasuredata_4_vers
 stackhpc_repo_ubuntu_cloud_archive_version: "{{ stackhpc_pulp_repo_ubuntu_cloud_archive_version }}"
 stackhpc_repo_ubuntu_focal_version: "{{ stackhpc_pulp_repo_ubuntu_focal_version }}"
 stackhpc_repo_ubuntu_focal_security_version: "{{ stackhpc_pulp_repo_ubuntu_focal_security_version }}"
+stackhpc_repo_ubuntu_jammy_version: "{{ stackhpc_pulp_repo_ubuntu_jammy_version }}"
+stackhpc_repo_ubuntu_jammy_security_version: "{{ stackhpc_pulp_repo_ubuntu_jammy_security_version }}"
 stackhpc_repo_docker_ce_ubuntu_version: "{{ stackhpc_pulp_repo_docker_ce_ubuntu_version }}"
 stackhpc_repo_centos_stream_9_nfv_openvswitch_version: "{{ stackhpc_pulp_repo_centos_stream_9_nfv_openvswitch_version }}"
 stackhpc_repo_centos_stream_9_openstack_yoga_version: "{{ stackhpc_pulp_repo_centos_stream_9_openstack_yoga_version }}"

etc/kayobe/pulp-repo-versions.yml

@@ -15,7 +15,7 @@ stackhpc_pulp_repo_centos_stream_9_nfv_openvswitch_version: 20230510T072502
 stackhpc_pulp_repo_centos_stream_9_openstack_yoga_version: 20230310T163106
 stackhpc_pulp_repo_centos_stream_9_opstools_version: 20230301T034123
 stackhpc_pulp_repo_centos_stream_9_storage_ceph_pacific_version: 20230308T155704
-stackhpc_pulp_repo_docker_ce_ubuntu_version: 20230420T073634
+stackhpc_pulp_repo_docker_ce_ubuntu_version: 20230811T005529
 stackhpc_pulp_repo_docker_version: 20230203T025251
 stackhpc_pulp_repo_elasticsearch_logstash_kibana_7_x_version: 20230203T025251
 stackhpc_pulp_repo_epel_9_version: 20230302T031902
@@ -50,6 +50,8 @@ stackhpc_pulp_repo_rocky_9_2_crb_version: 20230627T185020
 stackhpc_pulp_repo_rocky_9_2_extras_version: 20230612T072506
 stackhpc_pulp_repo_rocky_9_2_highavailability_version: 20230628T031859
 stackhpc_pulp_repo_treasuredata_4_version: 20221105T035018
-stackhpc_pulp_repo_ubuntu_cloud_archive_version: 20230704T193136
+stackhpc_pulp_repo_ubuntu_cloud_archive_version: 20230811T105337
 stackhpc_pulp_repo_ubuntu_focal_security_version: 20230704T193136
 stackhpc_pulp_repo_ubuntu_focal_version: 20230704T193136
+stackhpc_pulp_repo_ubuntu_jammy_security_version: 20230811T044829
+stackhpc_pulp_repo_ubuntu_jammy_version: 20230811T044829

etc/kayobe/pulp.yml

@@ -63,6 +63,7 @@ stackhpc_pulp_sync_for_local_container_build: false
 
 # Whether to sync Ubuntu packages.
 stackhpc_pulp_sync_ubuntu_focal: "{{ os_release == 'focal' }}"
+stackhpc_pulp_sync_ubuntu_jammy: "{{ os_release == 'jammy' }}"
 
 # Default configuration, which each element of stackhpc_pulp_deb_repos
 # is combined with
@@ -105,14 +106,31 @@ stackhpc_pulp_deb_repos:
     distributions: "focal-updates/{{ openstack_release }}"
     required: "{{ stackhpc_pulp_sync_ubuntu_focal | 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 }}"
     distribution_name: "docker-ce-for-ubuntu-"
     base_path: "docker-ce/ubuntu/"
-    distributions: "focal"
+    distributions: "focal jammy"
     components: "stable"
-    required: "{{ stackhpc_pulp_sync_ubuntu_focal | bool }}"
+    required: "{{ stackhpc_pulp_sync_ubuntu_focal or stackhpc_pulp_sync_ubuntu_jammy | bool }}"
 
 # Publication format is a subset of distribution.
 stackhpc_pulp_publication_deb_development: "{{ stackhpc_pulp_distribution_deb_development }}"

etc/kayobe/stackhpc.yml

@@ -22,6 +22,14 @@ stackhpc_repo_ubuntu_focal_version: "{{ stackhpc_repo_distribution }}"
 stackhpc_repo_ubuntu_focal_security_url: "{{ stackhpc_repo_mirror_url }}/pulp/content/ubuntu/focal-security/{{ stackhpc_repo_ubuntu_focal_security_version }}"
 stackhpc_repo_ubuntu_focal_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.