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

Fixes #38034 - Drop EL7 client support #11493

Merged
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
31 changes: 0 additions & 31 deletions comps/comps-foreman-client-rhel7.xml

This file was deleted.

52 changes: 0 additions & 52 deletions mock/el7.cfg

This file was deleted.

24 changes: 0 additions & 24 deletions package_manifest.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ copr_projects:
rhel_10: '10'
rhel_9: '9'
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 }}"
foreman_staging: "{{ root_repo_url }}/foreman-{{ foreman_version }}-staging"
Expand Down Expand Up @@ -84,11 +83,6 @@ copr_projects:
comps_file: "{{ inventory_dir }}/comps/comps-foreman-client-el{{ rhel_8 }}.xml"
external_repos:
- "{{ client_staging }}/rhel-{{ rhel_8 }}-x86_64"
- 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"
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"
Expand Down Expand Up @@ -494,13 +488,10 @@ foreman_client_packages:
- "el9-foreman-client-{{ foreman_version }}-staging"
el8:
- "el8-foreman-client-{{ foreman_version }}-staging"
el7:
- "el7-foreman-client-{{ foreman_version }}-staging"
repoclosure_lookaside_repos:
el10: "{{ hostvars['foreman-client-staging-repoclosure-el10']['repoclosure_lookaside_repos']['el10'] }}"
el9: "{{ hostvars['foreman-client-staging-repoclosure-el9']['repoclosure_lookaside_repos']['el9'] }}"
el8: "{{ hostvars['foreman-client-staging-repoclosure-el8']['repoclosure_lookaside_repos']['el8'] }}"
el7: "{{ hostvars['foreman-client-staging-repoclosure-el7']['repoclosure_lookaside_repos']['el7'] }}"
leap155:
- leap155-oss
- atix-sles155
Expand Down Expand Up @@ -890,18 +881,6 @@ repoclosures:
- el8-epel
- el8-extras
- "el8-puppet-{{ puppet_version }}"
foreman-client-staging-repoclosure-el7:
repoclosure_target_repos:
el7:
- "el7-foreman-client-{{ foreman_version }}-staging"
repoclosure_target_dist: el7
repoclosure_lookaside_repos:
el7:
- el7-base
- el7-updates
- el7-epel
- el7-extras
- "el7-puppet-{{ puppet_version }}"

foreman_release_packages:
vars:
Expand All @@ -916,13 +895,10 @@ foreman_release_packages:
- "el9-foreman-client-{{ foreman_version }}-staging"
el8:
- "el8-foreman-client-{{ foreman_version }}-staging"
el7:
- "el7-foreman-client-{{ foreman_version }}-staging"
repoclosure_lookaside_repos:
el10: "{{ hostvars['foreman-client-staging-repoclosure-el10']['repoclosure_lookaside_repos']['el10'] }}"
el9: "{{ hostvars['foreman-client-staging-repoclosure-el9']['repoclosure_lookaside_repos']['el9'] }}"
el8: "{{ hostvars['foreman-client-staging-repoclosure-el8']['repoclosure_lookaside_repos']['el8'] }}"
el7: "{{ hostvars['foreman-client-staging-repoclosure-el7']['repoclosure_lookaside_repos']['el7'] }}"
hosts:
foreman-release: {}

Expand Down
27 changes: 0 additions & 27 deletions repoclosure/yum.conf
Original file line number Diff line number Diff line change
Expand Up @@ -94,28 +94,6 @@ baseurl=https://stagingyum.theforeman.org/client/nightly/el8/x86_64/
name=el8-puppet-8
baseurl=https://yum.puppetlabs.com/puppet8/el/8/x86_64/

[el7-base]
name=BaseOS
enabled=1
baseurl=https://vault.centos.org/centos/7/os/x86_64/

[el7-updates]
name=updates
enabled=1
baseurl=https://vault.centos.org/centos/7/updates/x86_64/

[el7-extras]
name=extras
baseurl=https://vault.centos.org/centos/7/extras/x86_64/

[el7-epel]
name=epel
baseurl=https://archives.fedoraproject.org/pub/archive/epel/7/x86_64/

[el7-puppet-8]
name=el7-puppet-8
baseurl=https://yum.puppetlabs.com/puppet8/el/7/x86_64/

[el9-foreman-nightly-staging]
name=Foreman nightly staging EL9
baseurl=https://stagingyum.theforeman.org/foreman/nightly/el9/x86_64/
Expand All @@ -126,11 +104,6 @@ name=Foreman Plugins nightly staging EL9
baseurl=https://stagingyum.theforeman.org/plugins/nightly/el9/x86_64/
module_hotfixes=1

[el7-foreman-client-nightly-staging]
name=Foreman Client nightly EL7
baseurl=https://stagingyum.theforeman.org/client/nightly/el7/x86_64/


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