Skip to content
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.

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

Drop EL8 bits from Nightly #11332

Merged
merged 1 commit into from
Oct 25, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
540 changes: 0 additions & 540 deletions comps/comps-foreman-el8.xml

This file was deleted.

378 changes: 0 additions & 378 deletions comps/comps-foreman-plugins-el8.xml

This file was deleted.

80 changes: 0 additions & 80 deletions comps/comps-katello-el8.xml

This file was deleted.

49 changes: 0 additions & 49 deletions modulemd/modulemd-foreman-el8.yaml

This file was deleted.

25 changes: 0 additions & 25 deletions modulemd/modulemd-katello-el8.yaml

This file was deleted.

77 changes: 0 additions & 77 deletions package_manifest.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,6 @@ all:

copr_projects:
vars:
core_modules_el8:
- 'ruby:2.7'
- 'nodejs:14'
- 'postgresql:13'
core_modules_el9:
- 'nodejs:18'
core_buildroot_packages:
Expand All @@ -41,13 +37,6 @@ copr_projects:
copr_project_name: "foreman-{{ foreman_version }}-staging"
copr_project_fork_from: "{{ 'foreman-nightly-staging' if foreman_version != 'nightly' else False }}"
copr_project_chroots:
- name: "rhel-{{ rhel_8 }}-x86_64"
modules: "{{ core_modules_el8 }}"
external_repos:
- "{{ puppet_baseurl }}/el/{{ rhel_8 }}/x86_64/"
- "{{ foreman_staging }}/rhel-{{ rhel_8 }}-x86_64"
comps_file: "{{ inventory_dir }}/comps/comps-foreman-el{{ rhel_8 }}.xml"
buildroot_packages: "{{ core_buildroot_packages }}"
- name: "rhel-{{ rhel_9 }}-x86_64"
modules: "{{ core_modules_el9 }}"
external_repos:
Expand All @@ -59,13 +48,6 @@ copr_projects:
copr_project_name: "plugins-{{ foreman_version }}-staging"
copr_project_fork_from: "{{ 'plugins-nightly-staging' if foreman_version != 'nightly' else False }}"
copr_project_chroots:
- name: "rhel-{{ rhel_8 }}-x86_64"
modules: "{{ core_modules_el8 }}"
external_repos:
- "{{ foreman_staging }}/rhel-{{ rhel_8 }}-x86_64"
- "{{ plugins_staging }}/rhel-{{ rhel_8 }}-x86_64"
comps_file: "{{ inventory_dir }}/comps/comps-foreman-plugins-el{{ rhel_8 }}.xml"
buildroot_packages: "{{ plugins_buildroot_packages }}"
- name: "rhel-{{ rhel_9 }}-x86_64"
modules: "{{ core_modules_el9 }}"
external_repos:
Expand All @@ -77,14 +59,6 @@ copr_projects:
copr_project_name: "katello-{{ katello_version }}-staging"
copr_project_fork_from: "{{ 'katello-nightly-staging' if foreman_version != 'nightly' else False }}"
copr_project_chroots:
- name: "rhel-{{ rhel_8 }}-x86_64"
modules: "{{ core_modules_el8 }}"
external_repos:
- "{{ foreman_staging }}/rhel-{{ rhel_8 }}-x86_64"
- "{{ plugins_staging }}/rhel-{{ rhel_8 }}-x86_64"
- "{{ katello_staging }}/rhel-{{ rhel_8 }}-x86_64"
comps_file: "{{ inventory_dir }}/comps/comps-katello-el{{ rhel_8 }}.xml"
buildroot_packages: "{{ core_buildroot_packages }}"
- name: "rhel-{{ rhel_9 }}-x86_64"
modules: "{{ core_modules_el9 }}"
external_repos:
Expand Down Expand Up @@ -131,12 +105,9 @@ foreman_packages:
copr_projects:
- "{{ hostvars['foreman-copr'] }}"
repoclosure_target_repos:
el8:
- "el8-foreman-{{ foreman_version }}-staging"
el9:
- "el9-foreman-{{ foreman_version }}-staging"
repoclosure_lookaside_repos:
el8: "{{ hostvars['foreman-staging-repoclosure-el8']['repoclosure_lookaside_repos']['el8'] }}"
el9: "{{ hostvars['foreman-staging-repoclosure-el9']['repoclosure_lookaside_repos']['el9'] }}"
children:
foreman_core_packages: {}
Expand All @@ -150,12 +121,9 @@ plugin_packages:
- "{{ hostvars['plugins-copr'] }}"
package_base_dir: 'packages/plugins/'
repoclosure_target_repos:
el8:
- "el8-foreman-plugins-{{ foreman_version }}-staging"
el9:
- "el9-foreman-plugins-{{ foreman_version }}-staging"
repoclosure_lookaside_repos:
el8: "{{ hostvars['plugins-staging-repoclosure-el8']['repoclosure_lookaside_repos']['el8'] }}"
el9: "{{ hostvars['plugins-staging-repoclosure-el9']['repoclosure_lookaside_repos']['el9'] }}"
children:
foreman_plugin_packages: {}
Expand Down Expand Up @@ -545,12 +513,9 @@ katello_packages:
- "{{ hostvars['katello-copr'] }}"
package_base_dir: 'packages/katello/'
repoclosure_target_repos:
el8:
- "el8-katello-{{ katello_version }}-staging"
el9:
- "el9-katello-{{ katello_version }}-staging"
repoclosure_lookaside_repos:
el8: "{{ hostvars['katello-staging-repoclosure-el8']['repoclosure_lookaside_repos']['el8'] }}"
el9: "{{ hostvars['katello-staging-repoclosure-el9']['repoclosure_lookaside_repos']['el9'] }}"
children:
satellite_packages: {}
Expand Down Expand Up @@ -851,19 +816,6 @@ foreman_proxy_other_plugin_packages_tier2:

repoclosures:
hosts:
foreman-staging-repoclosure-el8:
repoclosure_target_repos:
el8:
- "el8-foreman-{{ foreman_version }}-staging"
repoclosure_target_dist: el8
repoclosure_lookaside_repos:
el8:
- el8-baseos
- el8-appstream
- el8-powertools
- el8-extras
- "el8-puppet-{{ puppet_version }}"
- "el8-candlepin-{{ candlepin_version }}-staging"
foreman-staging-repoclosure-el9:
repoclosure_target_repos:
el9:
Expand All @@ -875,20 +827,6 @@ repoclosures:
- el9-appstream
- "el9-puppet-{{ puppet_version }}"
- "el9-candlepin-{{ candlepin_version }}-staging"
plugins-staging-repoclosure-el8:
repoclosure_target_repos:
el8:
- "el8-foreman-plugins-{{ foreman_version }}-staging"
repoclosure_target_dist: el8
repoclosure_lookaside_repos:
el8:
- el8-baseos
- el8-appstream
- el8-powertools
- el8-configmanagement-salt
- el8-extras
- "el8-puppet-{{ puppet_version }}"
- "el8-foreman-{{ foreman_version }}-staging"
plugins-staging-repoclosure-el9:
repoclosure_target_repos:
el9:
Expand All @@ -901,21 +839,6 @@ repoclosures:
- el9-configmanagement-salt
- "el9-puppet-{{ puppet_version }}"
- "el9-foreman-{{ foreman_version }}-staging"
katello-staging-repoclosure-el8:
repoclosure_target_repos:
el8:
- "el8-katello-{{ katello_version }}-staging"
repoclosure_target_dist: el8
repoclosure_lookaside_repos:
el8:
- el8-baseos
- el8-appstream
- el8-powertools
- el8-extras
- "el8-puppet-{{ puppet_version }}"
- "el8-foreman-{{ foreman_version }}-staging"
- "el8-foreman-plugins-{{ foreman_version }}-staging"
- "el8-candlepin-{{ candlepin_version }}-staging"
katello-staging-repoclosure-el9:
repoclosure_target_repos:
el9:
Expand Down
4 changes: 2 additions & 2 deletions remove_from_comps
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ remove_from_comps - removes packagereqs for a package to a comps xml file
Usage #{$0} comps-file package-name [package-name]

Examples:
#{$0} comps/comps-foreman-el8.xml nodejs-example
#{$0} comps/comps-foreman-el8.xml nodejs-example nodejs-other-example
#{$0} comps/comps-foreman-el9.xml nodejs-example
#{$0} comps/comps-foreman-el9.xml nodejs-example nodejs-other-example

Return codes:

Expand Down
18 changes: 0 additions & 18 deletions repoclosure/yum.conf
Original file line number Diff line number Diff line change
Expand Up @@ -102,16 +102,6 @@ name=Foreman nightly staging EL9
baseurl=https://stagingyum.theforeman.org/foreman/nightly/el9/x86_64/
module_hotfixes=1

[el8-foreman-nightly-staging]
name=Foreman nightly staging EL8
baseurl=https://stagingyum.theforeman.org/foreman/nightly/el8/x86_64/
module_hotfixes=1

[el8-foreman-plugins-nightly-staging]
name=Foreman Plugins nightly staging EL8
baseurl=https://stagingyum.theforeman.org/plugins/nightly/el8/x86_64/
module_hotfixes=1

[el9-foreman-plugins-nightly-staging]
name=Foreman Plugins nightly staging EL9
baseurl=https://stagingyum.theforeman.org/plugins/nightly/el9/x86_64/
Expand All @@ -121,20 +111,12 @@ module_hotfixes=1
name=Foreman Client nightly EL7
baseurl=https://stagingyum.theforeman.org/client/nightly/el7/x86_64/

[el8-katello-nightly-staging]
name=Katello nightly staging EL8
baseurl=https://stagingyum.theforeman.org/katello/nightly/el8/x86_64/
module_hotfixes=1

[el9-katello-nightly-staging]
name=Katello nightly staging EL9
baseurl=https://stagingyum.theforeman.org/katello/nightly/el9/x86_64/
module_hotfixes=1

[el8-candlepin-4.4-staging]
name=Candlepin 4.4 staging EL8
baseurl=https://stagingyum.theforeman.org/candlepin/4.4/el8/x86_64/
module_hotfixes=1

[el9-candlepin-4.4-staging]
name=Candlepin 4.4 staging EL9
Expand Down