Skip to content

Commit

Permalink
Merge pull request #1127 from stackhpc/rocky9-sig-security
Browse files Browse the repository at this point in the history
Add Rocky 9 SIG Security Common repo
  • Loading branch information
priteau authored Jul 5, 2024
2 parents 4282971 + 15f9e46 commit a8475a0
Show file tree
Hide file tree
Showing 7 changed files with 24 additions and 1 deletion.
9 changes: 9 additions & 0 deletions etc/kayobe/dnf.yml
Original file line number Diff line number Diff line change
Expand Up @@ -116,6 +116,14 @@ dnf_custom_repos_rocky_9:
gpgcheck: yes
username: "{{ stackhpc_repo_mirror_username | default(omit, true) }}"
password: "{{ stackhpc_repo_mirror_password | default(omit, true) }}"
security-common:
baseurl: "{{ stackhpc_repo_rocky_9_sig_security_common_url }}"
description: "Rocky Linux $releasever - SIG Security Common"
file: Rocky-SIG-Security-Common
gpgkey: "{{ rocky_9_sig_security_gpg_key }}"
gpgcheck: yes
username: "{{ stackhpc_repo_mirror_username | default(omit, true) }}"
password: "{{ stackhpc_repo_mirror_password | default(omit, true) }}"

# Whether to enable EPEL repositories. This affects RedHat-based systems only.
dnf_enable_epel: "{{ dnf_install_epel | bool }}"
Expand All @@ -127,6 +135,7 @@ dnf_enable_elrepo_9: "{{ dnf_install_elrepo_9 | bool }}"
dnf_epel_9_gpg_key_url: "https://dl.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL-9"

rocky_9_gpg_key: "https://dl.rockylinux.org/pub/rocky/RPM-GPG-KEY-Rocky-9"
rocky_9_sig_security_gpg_key: "https://dl.rockylinux.org/pub/sig/9/security/x86_64/security-common/RPM-GPG-KEY-Rocky-SIG-Security"

# Whether to install the epel-release package. This affects RedHat-based
# systems only. Default value is 'false'.
Expand Down
1 change: 1 addition & 0 deletions etc/kayobe/environments/ci-aio/stackhpc-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@ stackhpc_repo_rocky_9_appstream_version: "{{ stackhpc_pulp_repo_rocky_9_appstrea
stackhpc_repo_rocky_9_extras_version: "{{ stackhpc_pulp_repo_rocky_9_extras_version }}"
stackhpc_repo_rocky_9_crb_version: "{{ stackhpc_pulp_repo_rocky_9_crb_version }}"
stackhpc_repo_rocky_9_highavailability_version: "{{ stackhpc_pulp_repo_rocky_9_highavailability_version }}"
stackhpc_repo_rocky_9_sig_security_common_version: "{{ stackhpc_pulp_repo_rocky_9_sig_security_common_version }}"

# Rocky-and-CI-specific Pulp urls
stackhpc_include_os_minor_version_in_repo_url: true
Expand Down
1 change: 1 addition & 0 deletions etc/kayobe/environments/ci-builder/stackhpc-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,7 @@ stackhpc_repo_rocky_9_appstream_version: "{{ stackhpc_pulp_repo_rocky_9_appstrea
stackhpc_repo_rocky_9_extras_version: "{{ stackhpc_pulp_repo_rocky_9_extras_version }}"
stackhpc_repo_rocky_9_crb_version: "{{ stackhpc_pulp_repo_rocky_9_crb_version }}"
stackhpc_repo_rocky_9_highavailability_version: "{{ stackhpc_pulp_repo_rocky_9_highavailability_version }}"
stackhpc_repo_rocky_9_sig_security_common_version: "{{ stackhpc_pulp_repo_rocky_9_sig_security_common_version }}"

# Rocky-and-CI-specific Pulp urls
stackhpc_include_os_minor_version_in_repo_url: true
Expand Down
1 change: 1 addition & 0 deletions etc/kayobe/environments/ci-multinode/stackhpc-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ stackhpc_repo_rocky_9_appstream_version: "{{ stackhpc_pulp_repo_rocky_9_appstrea
stackhpc_repo_rocky_9_extras_version: "{{ stackhpc_pulp_repo_rocky_9_extras_version }}"
stackhpc_repo_rocky_9_crb_version: "{{ stackhpc_pulp_repo_rocky_9_crb_version }}"
stackhpc_repo_rocky_9_highavailability_version: "{{ stackhpc_pulp_repo_rocky_9_highavailability_version }}"
stackhpc_repo_rocky_9_sig_security_common_version: "{{ stackhpc_pulp_repo_rocky_9_sig_security_common_version }}"

# Rocky-and-CI-specific Pulp urls
stackhpc_include_os_minor_version_in_repo_url: true
Expand Down
3 changes: 2 additions & 1 deletion etc/kayobe/pulp-repo-versions.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ stackhpc_pulp_repo_rocky_9_3_baseos_version: 20240413T014042
stackhpc_pulp_repo_rocky_9_3_crb_version: 20240413T014042
stackhpc_pulp_repo_rocky_9_3_extras_version: 20240413T014042
stackhpc_pulp_repo_rocky_9_3_highavailability_version: 20240404T012937
stackhpc_pulp_repo_ubuntu_jammy_version: 20240418T043733
stackhpc_pulp_repo_rocky_9_sig_security_common_version: 20240705T092559
stackhpc_pulp_repo_ubuntu_cloud_archive_version: 20240418T070026
stackhpc_pulp_repo_ubuntu_jammy_security_version: 20240418T043733
stackhpc_pulp_repo_ubuntu_jammy_version: 20240418T043733
6 changes: 6 additions & 0 deletions etc/kayobe/pulp.yml
Original file line number Diff line number Diff line change
Expand Up @@ -272,6 +272,12 @@ stackhpc_pulp_rpm_repos:
base_path: "rocky/9/highavailability/x86_64/os/"
required: "{{ stackhpc_pulp_sync_rocky_9 | bool }}"

- name: Rocky Linux 9 - SIG Security Common
url: "{{ stackhpc_release_pulp_content_url }}/rocky/sig/9/security/x86_64/security-common/{{ stackhpc_pulp_repo_rocky_9_sig_security_common_version }}"
distribution_name: rocky-9-sig-security-common-
base_path: "rocky/sig/9/security/x86_64/security-common/"
required: "{{ stackhpc_pulp_sync_rocky_9 | bool }}"

# Additional CentOS Stream 9 repositories
- name: CentOS Stream 9 - NFV OpenvSwitch
url: "{{ stackhpc_release_pulp_content_url }}/centos/9-stream/nfv/x86_64/openvswitch-2/{{ stackhpc_pulp_repo_centos_stream_9_nfv_openvswitch_version }}"
Expand Down
4 changes: 4 additions & 0 deletions etc/kayobe/stackhpc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,10 @@ stackhpc_repo_rocky_9_extras_version: "{{ stackhpc_repo_distribution }}"
stackhpc_repo_rocky_9_highavailability_url: "{{ stackhpc_repo_mirror_url }}/pulp/content/rocky/{{ stackhpc_rocky_9_url_version }}/highavailability/x86_64/os/{{ stackhpc_repo_rocky_9_highavailability_version }}"
stackhpc_repo_rocky_9_highavailability_version: "{{ stackhpc_repo_distribution }}"

# Rocky 9 SIG Security Common
stackhpc_repo_rocky_9_sig_security_common_url: "{{ stackhpc_repo_mirror_url }}/pulp/content/rocky/sig/9/security/x86_64/security-common/{{ stackhpc_repo_rocky_9_sig_security_common_version }}"
stackhpc_repo_rocky_9_sig_security_common_version: "{{ stackhpc_repo_distribution }}"

# EPEL 9
stackhpc_repo_epel_9_url: "{{ stackhpc_repo_mirror_url }}/pulp/content/epel/9/Everything/x86_64/{{ stackhpc_repo_epel_9_version }}"
stackhpc_repo_epel_9_version: "{{ stackhpc_repo_distribution }}"
Expand Down

0 comments on commit a8475a0

Please sign in to comment.