Skip to content

Separate out repos for Docker CE Ubuntu Jammy/Focal #279

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
m-bull merged 2 commits into from
Jan 22, 2024
Merged

Separate out repos for Docker CE Ubuntu Jammy/Focal #279

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
97106d0
Separate repos for Docker CE Ubuntu Jammy/Focal
m-bull Jan 22, 2024
c5d3b86
Fix CI tests
m-bull Jan 22, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 20 additions & 5 deletions ansible/inventory/group_vars/all/package-repos
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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: ""
Expand Down
10 changes: 5 additions & 5 deletions ansible/validate-deb-repos.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down