From e65c25970bd963792c95250308334f4d7ecc71f5 Mon Sep 17 00:00:00 2001 From: Ewoud Kohl van Wijngaarden Date: Thu, 21 Nov 2024 18:28:06 +0100 Subject: [PATCH] Fixes #38034 - Drop EL7 client support --- comps/comps-foreman-client-rhel7.xml | 31 ----------------- mock/el7.cfg | 52 ---------------------------- package_manifest.yaml | 24 ------------- repoclosure/yum.conf | 27 --------------- 4 files changed, 134 deletions(-) delete mode 100644 comps/comps-foreman-client-rhel7.xml delete mode 100644 mock/el7.cfg diff --git a/comps/comps-foreman-client-rhel7.xml b/comps/comps-foreman-client-rhel7.xml deleted file mode 100644 index c456dd26af..0000000000 --- a/comps/comps-foreman-client-rhel7.xml +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - - foreman-client - Foreman Client - Foreman Client Packages - true - - foreman-client-release - foreman_ygg_worker - katello-host-tools - katello-host-tools-tracer - katello-pull-transport-migrate - python2-psutil - python2-tracer - rubygem-foreman_scap_client - tracer-common - yggdrasil - - - rubygem-foreman_scap_client-doc - - - - diff --git a/mock/el7.cfg b/mock/el7.cfg deleted file mode 100644 index 20d6262f58..0000000000 --- a/mock/el7.cfg +++ /dev/null @@ -1,52 +0,0 @@ -# Note we share the same root as the default epel-7-x86_64 config as the -# chroot setup should be identical -config_opts['root'] = 'epel-7-x86_64' -config_opts['target_arch'] = 'x86_64' -config_opts['legal_host_arches'] = ('x86_64',) -config_opts['chroot_setup_cmd'] = 'install @buildsys-build yum vim --exclude=devtoolset*' -config_opts['dist'] = 'el7' # only useful for --resultdir variable subst -# beware RHEL use 7Server or 7Client -config_opts['releasever'] = '7' -config_opts['package_manager'] = 'yum' - -config_opts['yum.conf'] = """ -[main] -cachedir=/var/cache/yum -debuglevel=1 -reposdir=/dev/null -logfile=/var/log/yum.log -retries=20 -obsoletes=1 -gpgcheck=0 -assumeyes=1 -syslog_ident=mock -syslog_device= - -# repos -[base] -name=BaseOS -enabled=1 -mirrorlist=http://mirrorlist.centos.org/?release=7&arch=x86_64&repo=os -failovermethod=priority - -[updates] -name=updates -enabled=1 -mirrorlist=http://mirrorlist.centos.org/?release=7&arch=x86_64&repo=updates -failovermethod=priority - -[epel] -name=epel -mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=epel-7&arch=x86_64 -failovermethod=priority - -[epel-testing] -name=epel-testing -enabled=0 -mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=testing-epel7&arch=x86_64 -failovermethod=priority - -[puppet-8] -name=puppet-8 -baseurl=https://yum.puppetlabs.com/puppet8/el/7/x86_64/ -""" diff --git a/package_manifest.yaml b/package_manifest.yaml index a10c25decd..6c44779f96 100644 --- a/package_manifest.yaml +++ b/package_manifest.yaml @@ -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" @@ -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" @@ -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 @@ -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: @@ -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: {} diff --git a/repoclosure/yum.conf b/repoclosure/yum.conf index 481897bcd3..1629e38467 100644 --- a/repoclosure/yum.conf +++ b/repoclosure/yum.conf @@ -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/ @@ -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/