Drop EL8 bits from Nightly

theforeman · Oct 22, 2024 · 2d4b8c2 · 2d4b8c2
1 parent aafef3c
commit 2d4b8c2
Show file tree

Hide file tree

Showing 8 changed files with 2 additions and 1,169 deletions.
diff --git a/comps/comps-foreman-el8.xml b/comps/comps-foreman-el8.xml
diff --git a/comps/comps-foreman-plugins-el8.xml b/comps/comps-foreman-plugins-el8.xml
diff --git a/comps/comps-katello-el8.xml b/comps/comps-katello-el8.xml
diff --git a/modulemd/modulemd-foreman-el8.yaml b/modulemd/modulemd-foreman-el8.yaml
diff --git a/modulemd/modulemd-katello-el8.yaml b/modulemd/modulemd-katello-el8.yaml
diff --git a/package_manifest.yaml b/package_manifest.yaml
@@ -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:
@@ -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:
@@ -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:
@@ -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:
@@ -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: {}
@@ -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: {}
@@ -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: {}
@@ -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:
@@ -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:
@@ -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:

diff --git a/remove_from_comps b/remove_from_comps
@@ -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:
 

diff --git a/repoclosure/yum.conf b/repoclosure/yum.conf
@@ -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/
@@ -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