From 1ee34d46c1a5ad7e51a1abd78ec9a33741a48c21 Mon Sep 17 00:00:00 2001 From: Ewoud Kohl van Wijngaarden Date: Fri, 6 Dec 2024 18:31:29 +0100 Subject: [PATCH] Use copr:// links for external repositories This has the benefit that COPR internally knows where to download it from. We don't need to repeat the specific buildroot name. --- package_manifest.yaml | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/package_manifest.yaml b/package_manifest.yaml index 0e8b0bed9a..6bda66db10 100644 --- a/package_manifest.yaml +++ b/package_manifest.yaml @@ -27,7 +27,7 @@ copr_projects: rhel_8: '8' rhel_7: '7' puppet_baseurl: "https://yum.puppet.com/puppet{{ puppet_version }}" - root_repo_url: "https://download.copr.fedorainfracloud.org/results/{{ copr_project_user }}" + root_repo_url: "copr://{{ copr_project_user }}" foreman_staging: "{{ root_repo_url }}/foreman-{{ foreman_version }}-staging" plugins_staging: "{{ root_repo_url }}/plugins-{{ foreman_version }}-staging" katello_staging: "{{ root_repo_url }}/katello-{{ katello_version }}-staging" @@ -41,7 +41,7 @@ copr_projects: modules: "{{ core_modules_el9 }}" external_repos: - "{{ puppet_baseurl }}/el/{{ rhel_9 }}/x86_64/" - - "{{ foreman_staging }}/rhel-{{ rhel_9 }}-x86_64" + - "{{ foreman_staging }}" comps_file: "{{ inventory_dir }}/comps/comps-foreman-el{{ rhel_9 }}.xml" buildroot_packages: "{{ core_buildroot_packages }}" plugins-copr: @@ -51,8 +51,8 @@ copr_projects: - name: "rhel-{{ rhel_9 }}-x86_64" modules: "{{ core_modules_el9 }}" external_repos: - - "{{ foreman_staging }}/rhel-{{ rhel_9 }}-x86_64" - - "{{ plugins_staging }}/rhel-{{ rhel_9 }}-x86_64" + - "{{ foreman_staging }}" + - "{{ plugins_staging }}" comps_file: "{{ inventory_dir }}/comps/comps-foreman-plugins-el{{ rhel_9 }}.xml" buildroot_packages: "{{ core_buildroot_packages }}" katello-copr: @@ -62,9 +62,9 @@ copr_projects: - name: "rhel-{{ rhel_9 }}-x86_64" modules: "{{ core_modules_el9 }}" external_repos: - - "{{ foreman_staging }}/rhel-{{ rhel_9 }}-x86_64" - - "{{ plugins_staging }}/rhel-{{ rhel_9 }}-x86_64" - - "{{ katello_staging }}/rhel-{{ rhel_9 }}-x86_64" + - "{{ foreman_staging }}" + - "{{ plugins_staging }}" + - "{{ katello_staging }}" comps_file: "{{ inventory_dir }}/comps/comps-katello-el{{ rhel_9 }}.xml" buildroot_packages: "{{ core_buildroot_packages }}" client-copr: @@ -74,19 +74,19 @@ copr_projects: - name: "rhel-{{ rhel_9 }}-x86_64" comps_file: "{{ inventory_dir }}/comps/comps-foreman-client-el{{ rhel_9 }}.xml" external_repos: - - "{{ client_staging }}/rhel-{{ rhel_9 }}-x86_64" + - "{{ client_staging }}" - name: "rhel-{{ rhel_8 }}-x86_64" comps_file: "{{ inventory_dir }}/comps/comps-foreman-client-el{{ rhel_8 }}.xml" external_repos: - - "{{ client_staging }}/rhel-{{ rhel_8 }}-x86_64" + - "{{ client_staging }}" - name: "rhel-{{ rhel_7 }}-x86_64" external_repos: - "https://archives.fedoraproject.org/pub/archive/epel/{{ rhel_7 }}/x86_64/" - - "{{ client_staging }}/rhel-{{ rhel_7 }}-x86_64" + - "{{ client_staging }}" comps_file: "{{ inventory_dir }}/comps/comps-foreman-client-rhel{{ rhel_7 }}.xml" - name: "opensuse-leap-15.5-x86_64" external_repos: - - "{{ client_staging }}/opensuse-leap-15.5-x86_64" + - "{{ client_staging }}" comps_file: "{{ inventory_dir }}/comps/comps-foreman-client-sles155.xml" packages: