Add Ubuntu Jammy repository config

Author: assumptionsandg

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
@@ -63,12 +63,12 @@ stackhpc_apt_repositories:
     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

@@ -53,3 +53,5 @@ stackhpc_pulp_repo_treasuredata_4_version: 20221105T035018
 stackhpc_pulp_repo_ubuntu_cloud_archive_version: 20230704T193136
 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' }}"
 
 stackhpc_pulp_repository_deb_repos:
   # Base Ubuntu Focal repositories
@@ -96,7 +97,7 @@ stackhpc_pulp_repository_deb_repos:
     state: present
     required: "{{ stackhpc_pulp_sync_ubuntu_focal | bool }}"
 
-  # Ubuntu Cloud Archive (UCA) repositories
+  # Ubuntu Cloud Archive (UCA) Focal repositories
   - name: Ubuntu Cloud Archive
     url: "{{ stackhpc_release_pulp_content_url }}/ubuntu-cloud-archive/{{ stackhpc_pulp_repo_ubuntu_cloud_archive_version }}"
     remote_username: "{{ stackhpc_release_pulp_username }}"
@@ -112,7 +113,7 @@ stackhpc_pulp_repository_deb_repos:
     state: present
     required: "{{ stackhpc_pulp_sync_ubuntu_focal | bool }}"
 
-  # Third-party repositories
+  # Third-party repositories for Focal
   - name: Docker CE for Ubuntu
     url: "{{ stackhpc_release_pulp_content_url }}/docker-ce/ubuntu/{{ stackhpc_pulp_repo_docker_ce_ubuntu_version }}"
     remote_username: "{{ stackhpc_release_pulp_username }}"
@@ -128,6 +129,69 @@ stackhpc_pulp_repository_deb_repos:
     state: present
     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 }}"
+    remote_username: "{{ stackhpc_release_pulp_username }}"
+    remote_password: "{{ stackhpc_release_pulp_password }}"
+    client_cert: ""
+    client_key: ""
+    policy: on_demand
+    proxy_url: "{{ pulp_proxy_url }}"
+    architectures: amd64
+    components: main restricted universe multiverse
+    distributions: jammy jammy-updates jammy-backports
+    mirror: true
+    state: present
+    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 }}"
+    remote_username: "{{ stackhpc_release_pulp_username }}"
+    remote_password: "{{ stackhpc_release_pulp_password }}"
+    client_cert: ""
+    client_key: ""
+    policy: on_demand
+    proxy_url: "{{ pulp_proxy_url }}"
+    architectures: amd64
+    components: main restricted universe multiverse
+    distributions: jammy-security
+    mirror: true
+    state: present
+    required: "{{ stackhpc_pulp_sync_ubuntu_jammy | bool }}"
+
+  # Ubuntu Cloud Archive (UCA) Jammy repositories
+  - name: Ubuntu Cloud Archive
+    url: "{{ stackhpc_release_pulp_content_url }}/ubuntu-cloud-archive/{{ stackhpc_pulp_repo_ubuntu_cloud_archive_version }}"
+    remote_username: "{{ stackhpc_release_pulp_username }}"
+    remote_password: "{{ stackhpc_release_pulp_password }}"
+    client_cert: ""
+    client_key: ""
+    policy: on_demand
+    proxy_url: "{{ pulp_proxy_url }}"
+    architectures: amd64
+    components: main
+    distributions: "jammy-updates/{{ openstack_release }}"
+    mirror: true
+    state: present
+    required: "{{ stackhpc_pulp_sync_ubuntu_jammy | bool }}"
+
+  # Third-party repositories for Jammy
+  - name: Docker CE for Ubuntu
+    url: "{{ stackhpc_release_pulp_content_url }}/docker-ce/ubuntu/{{ stackhpc_pulp_repo_docker_ce_ubuntu_version }}"
+    remote_username: "{{ stackhpc_release_pulp_username }}"
+    remote_password: "{{ stackhpc_release_pulp_password }}"
+    client_cert: ""
+    client_key: ""
+    policy: on_demand
+    proxy_url: "{{ pulp_proxy_url }}"
+    architectures: amd64
+    distributions: jammy
+    components: stable
+    mirror: true
+    state: present
+    required: "{{ stackhpc_pulp_sync_ubuntu_jammy | bool }}"
+
 # Publication format is a subset of distribution.
 stackhpc_pulp_publication_deb_development: "{{ stackhpc_pulp_distribution_deb_development }}"
 
@@ -150,22 +214,52 @@ stackhpc_pulp_distribution_deb_development:
     state: present
     required: "{{ stackhpc_pulp_sync_ubuntu_focal | bool }}"
 
-  # Ubuntu Cloud Archive (UCA) repositories
+  # Ubuntu Cloud Archive (UCA) Focal repositories
   - name: "ubuntu-cloud-archive-development"
     repository: Ubuntu Cloud Archive
     base_path: "ubuntu-cloud-archive/development"
     mode: verbatim
     state: present
     required: "{{ stackhpc_pulp_sync_ubuntu_focal | bool }}"
 
-  # Third-party repositories
+  # Third-party repositories for Focal
   - name: "docker-ce-for-ubuntu-development"
     repository: Docker CE for Ubuntu
     base_path: "docker-ce/ubuntu/development"
     mode: verbatim
     state: present
     required: "{{ stackhpc_pulp_sync_ubuntu_focal | bool }}"
 
+  # Base Ubuntu Jammy repositories
+  - name: "ubuntu-jammy-development"
+    repository: Ubuntu jammy
+    base_path: "ubuntu/jammy/development"
+    mode: verbatim
+    state: present
+    required: "{{ stackhpc_pulp_sync_ubuntu_jammy | bool }}"
+  - name: "ubuntu-jammy-security-development"
+    repository: Ubuntu jammy security
+    base_path: "ubuntu/jammy-security/development"
+    mode: verbatim
+    state: present
+    required: "{{ stackhpc_pulp_sync_ubuntu_jammy | bool }}"
+
+  # Ubuntu Cloud Archive (UCA) Jammy repositories
+  - name: "ubuntu-cloud-archive-development"
+    repository: Ubuntu Cloud Archive
+    base_path: "ubuntu-cloud-archive/development"
+    mode: verbatim
+    state: present
+    required: "{{ stackhpc_pulp_sync_ubuntu_jammy | bool }}"
+
+  # Third-party repositories for Jammy
+  - name: "docker-ce-for-ubuntu-development"
+    repository: Docker CE for Ubuntu
+    base_path: "docker-ce/ubuntu/development"
+    mode: verbatim
+    state: present
+    required: "{{ stackhpc_pulp_sync_ubuntu_jammy | bool }}"
+
 # Development gets promoted to production.
 stackhpc_pulp_distribution_deb_production:
   # Base Ubuntu Focal repositories
@@ -182,21 +276,51 @@ stackhpc_pulp_distribution_deb_production:
     state: present
     required: "{{ stackhpc_pulp_sync_ubuntu_focal | bool }}"
 
-  # Ubuntu Cloud Archive (UCA) repositories
+  # Ubuntu Cloud Archive (UCA) Focal repositories
   - name: "ubuntu-cloud-archive-production"
     repository: Ubuntu Cloud Archive
     base_path: "ubuntu-cloud-archive/production"
     mode: verbatim
     state: present
     required: "{{ stackhpc_pulp_sync_ubuntu_focal | bool }}"
 
-  # Third-party repositories
+  # Third-party repositories for Focal
   - name: "docker-ce-for-ubuntu-production"
     repository: Docker CE for Ubuntu
     base_path: "docker-ce/ubuntu/production"
     mode: verbatim
     state: present
-    required: "{{ stackhpc_pulp_sync_ubuntu_focal | bool }}"
+    required: "{{ stackhpc_pulp_sync_ubuntu_focal | bool }}" 
+
+  # Base Ubuntu Jammy repositories
+  - name: "ubuntu-jammy-production"
+    repository: Ubuntu jammy
+    base_path: "ubuntu/jammy/production"
+    mode: verbatim
+    state: present
+    required: "{{ stackhpc_pulp_sync_ubuntu_jammy | bool }}"
+  - name: "ubuntu-jammy-security-production"
+    repository: Ubuntu jammy security
+    base_path: "ubuntu/jammy-security/production"
+    mode: verbatim
+    state: present
+    required: "{{ stackhpc_pulp_sync_ubuntu_jammy | bool }}"
+
+  # Ubuntu Cloud Archive (UCA) Jammy repositories
+  - name: "ubuntu-cloud-archive-production"
+    repository: Ubuntu Cloud Archive
+    base_path: "ubuntu-cloud-archive/production"
+    mode: verbatim
+    state: present
+    required: "{{ stackhpc_pulp_sync_ubuntu_jammy | bool }}"
+
+  # Third-party repositories for Jammy
+  - name: "docker-ce-for-ubuntu-production"
+    repository: Docker CE for Ubuntu
+    base_path: "docker-ce/ubuntu/production"
+    mode: verbatim
+    state: present
+    required: "{{ stackhpc_pulp_sync_ubuntu_jammy | bool }}"
 
 ###############################################################################
 # RPMs

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 }}"