Build core packages with EL10

Containerfile

@@ -10,10 +10,10 @@ RUN echo "[git-annex]" >> /etc/yum.repos.d/git-annex.repo \
          && echo "gpgcheck=0" >> /etc/yum.repos.d/git-annex.repo \
          && echo "enabled=1" >> /etc/yum.repos.d/git-annex.repo
 
-RUN dnf -y module enable nodejs:18
+RUN dnf -y module enable nodejs:22
 
 RUN dnf install -y epel-release && \
-    dnf -y install nodejs vim git rpmdevtools git-annex-standalone wget ruby jq ruby-devel make gcc-c++ mock postgresql-devel libxml2-devel libcurl-devel systemd-devel rpmlint \
+    dnf -y install nodejs npm vim git rpmdevtools git-annex-standalone wget ruby jq ruby-devel make gcc-c++ mock postgresql-devel libxml2-devel libcurl-devel systemd-devel rpmlint \
     python3 python3-pip python3-ruamel-yaml python3-requests python3-packaging
 
 RUN npm install npm2rpm --global

comps/comps-foreman-el9.xml

@@ -10,7 +10,6 @@
       <packagereq type="default">dynflow-utils</packagereq>
       <packagereq type="default">foreman</packagereq>
       <packagereq type="default">foreman-assets</packagereq>
-      <packagereq type="default">foremanctl</packagereq>
       <packagereq type="default">foreman-bootloaders-redhat</packagereq>
       <packagereq type="default">foreman-bootloaders-redhat</packagereq>
       <packagereq type="default">foreman-bootloaders-redhat-tftpboot</packagereq>
@@ -39,6 +38,7 @@
       <packagereq type="default">foreman-service</packagereq>
       <packagereq type="default">foreman-telemetry</packagereq>
       <packagereq type="default">foreman-vmware</packagereq>
+      <packagereq type="default">foremanctl</packagereq>
       <packagereq type="default">katello-certs-tools</packagereq>
       <packagereq type="default">libsass</packagereq>
       <packagereq type="default">libsass-devel</packagereq>
@@ -48,9 +48,7 @@
       <packagereq type="default">nodejs-axios</packagereq>
       <packagereq type="default">nodejs-babel-core</packagereq>
       <packagereq type="default">nodejs-babel-loader</packagereq>
-      <packagereq type="default">nodejs-babel-plugin-transform-class-properties</packagereq>
       <packagereq type="default">nodejs-babel-preset-env</packagereq>
-      <packagereq type="default">nodejs-babel-preset-react</packagereq>
       <packagereq type="default">nodejs-babel-runtime</packagereq>
       <packagereq type="default">nodejs-bootstrap-sass</packagereq>
       <packagereq type="default">nodejs-buffer</packagereq>
@@ -75,9 +73,9 @@
       <packagereq type="default">nodejs-formik</packagereq>
       <packagereq type="default">nodejs-graphql</packagereq>
       <packagereq type="default">nodejs-graphql-tag</packagereq>
-      <packagereq type="default">nodejs-harmony-reflect</packagereq>
       <packagereq type="default">nodejs-history</packagereq>
       <packagereq type="default">nodejs-humanize-duration</packagereq>
+      <packagereq type="default">nodejs-ieee754</packagereq>
       <packagereq type="default">nodejs-intl</packagereq>
       <packagereq type="default">nodejs-ipaddr.js</packagereq>
       <packagereq type="default">nodejs-jed</packagereq>
@@ -88,10 +86,10 @@
       <packagereq type="default">nodejs-jstz</packagereq>
       <packagereq type="default">nodejs-lodash</packagereq>
       <packagereq type="default">nodejs-lodash.debounce</packagereq>
-      <packagereq type="default">nodejs-loose-envify</packagereq>
       <packagereq type="default">nodejs-mini-css-extract-plugin</packagereq>
       <packagereq type="default">nodejs-module-federation-utilities</packagereq>
       <packagereq type="default">nodejs-multiselect</packagereq>
+      <packagereq type="default">nodejs-neo-async</packagereq>
       <packagereq type="default">nodejs-novnc-novnc</packagereq>
       <packagereq type="default">nodejs-number_helpers</packagereq>
       <packagereq type="default">nodejs-openshift-dynamic-plugin-sdk</packagereq>
@@ -107,7 +105,6 @@
       <packagereq type="default">nodejs-patternfly-react-styles</packagereq>
       <packagereq type="default">nodejs-patternfly-react-table</packagereq>
       <packagereq type="default">nodejs-patternfly-react-tokens</packagereq>
-      <packagereq type="default">nodejs-performance-now</packagereq>
       <packagereq type="default">nodejs-prop-types</packagereq>
       <packagereq type="default">nodejs-rc-input-number</packagereq>
       <packagereq type="default">nodejs-react</packagereq>
@@ -144,7 +141,6 @@
       <packagereq type="default">nodejs-sortabular</packagereq>
       <packagereq type="default">nodejs-spice-project-spice-html5</packagereq>
       <packagereq type="default">nodejs-style-loader</packagereq>
-      <packagereq type="default">nodejs-symbol-observable</packagereq>
       <packagereq type="default">nodejs-table-resolver</packagereq>
       <packagereq type="default">nodejs-theforeman-builder</packagereq>
       <packagereq type="default">nodejs-theforeman-vendor</packagereq>

package_manifest.yaml

@@ -1,6 +1,7 @@
 ---
 all:
   vars:
+    bootstrap: false
     foremandist: .fm3_18
     foreman_version: 'nightly'
     katello_version: 'nightly'
@@ -17,17 +18,16 @@ copr_projects:
   vars:
     core_modules_el9:
       - 'nodejs:22'
-    core_buildroot_packages:
-      - 'foreman-build'
+    core_buildroot_packages: "{{ [] if bootstrap|bool else ['foreman-build']}}"
     plugins_buildroot_packages:
       - 'foreman-build'
       - python3.12-rpm-macros
       - python3.12
     rhel_10: '10'
     rhel_9: '9'
     rhel_8: '8'
-    puppet_baseurl: "https://yum.puppet.com/puppet{{ puppet_version }}"
-    root_repo_url: "https://download.copr.fedorainfracloud.org/results/{{ copr_project_user }}"
+    puppet_baseurl: "https://yum.voxpupuli.org/openvox{{ puppet_version }}"
+    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"
@@ -39,9 +39,18 @@ copr_projects:
       copr_project_chroots:
         - name: "rhel-{{ rhel_9 }}-x86_64"
           modules: "{{ core_modules_el9 }}"
+          rpmbuild_with: "{{ ['bootstrap'] if bootstrap|bool else []}}"
           external_repos:
-            - "{{ puppet_baseurl }}/el/{{ rhel_9 }}/x86_64/"
-            - "{{ foreman_staging }}/rhel-{{ rhel_9 }}-x86_64"
+            - "{{ puppet_baseurl }}/el/$releasever/$basearch/"
+            - "{{ foreman_staging }}"
+          comps_file: "{{ inventory_dir }}/comps/comps-foreman-el{{ rhel_9 }}.xml"
+          buildroot_packages: "{{ core_buildroot_packages }}"
+        - name: "rhel-{{ rhel_10 }}-x86_64"
+          rpmbuild_with: "{{ ['bootstrap'] if bootstrap|bool else []}}"
+          external_repos:
+            - "{{ puppet_baseurl }}/el/$releasever/$basearch/"
+            - "{{ foreman_staging }}"
+          # TODO: does EL10 need its own comps?
           comps_file: "{{ inventory_dir }}/comps/comps-foreman-el{{ rhel_9 }}.xml"
           buildroot_packages: "{{ core_buildroot_packages }}"
     plugins-copr:
@@ -51,8 +60,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 +71,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,18 +83,18 @@ copr_projects:
         - name: "rhel-{{ rhel_10 }}-x86_64"
           comps_file: "{{ inventory_dir }}/comps/comps-foreman-client-el{{ rhel_10 }}.xml"
           external_repos:
-            - "{{ client_staging }}/rhel-{{ rhel_10 }}-x86_64"
+            - "{{ client_staging }}"
         - 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: "opensuse-leap-15.6-x86_64"
           external_repos:
-            - "{{ client_staging }}/opensuse-leap-15.6-x86_64"
+            - "{{ client_staging }}"
           comps_file: "{{ inventory_dir }}/comps/comps-foreman-client-sles156.xml"
 
 packages:
@@ -383,13 +392,10 @@ foreman_nodejs_packages:
       strategy: bundle
     nodejs-babel-loader:
       strategy: bundle
-    nodejs-babel-plugin-transform-class-properties:
-      strategy: bundle
     nodejs-babel-preset-env:
       strategy: bundle
-    nodejs-babel-preset-react:
-      strategy: bundle
     nodejs-babel-runtime: {}
+    nodejs-base64-js: {}
     nodejs-bootstrap-sass: {}
     nodejs-buffer: {}
     nodejs-c3: {}
@@ -414,9 +420,9 @@ foreman_nodejs_packages:
     nodejs-formik: {}
     nodejs-graphql: {}
     nodejs-graphql-tag: {}
-    nodejs-harmony-reflect: {}
     nodejs-history: {}
     nodejs-humanize-duration: {}
+    nodejs-ieee754: {}
     nodejs-intl: {}
     nodejs-ipaddr.js: {}
     nodejs-jed: {}
@@ -427,10 +433,10 @@ foreman_nodejs_packages:
     nodejs-jstz: {}
     nodejs-lodash: {}
     nodejs-lodash.debounce: {}
-    nodejs-loose-envify: {}
     nodejs-mini-css-extract-plugin: {}
     nodejs-module-federation-utilities: {}
     nodejs-multiselect: {}
+    nodejs-neo-async: {}
     nodejs-novnc-novnc: {}
     nodejs-number_helpers: {}
     nodejs-openshift-dynamic-plugin-sdk: {}
@@ -446,7 +452,6 @@ foreman_nodejs_packages:
     nodejs-patternfly-react-styles: {}
     nodejs-patternfly-react-tokens: {}
     nodejs-patternfly-react-table: {}
-    nodejs-performance-now: {}
     nodejs-prop-types: {}
     nodejs-rc-input-number: {}
     nodejs-react: {}
@@ -489,7 +494,6 @@ foreman_nodejs_packages:
     nodejs-spice-project-spice-html5: {}
     nodejs-style-loader:
       strategy: bundle
-    nodejs-symbol-observable: {}
     nodejs-table-resolver: {}
     nodejs-theforeman-builder:
       name: "@theforeman/builder"

packages/foreman/foreman-proxy/foreman-proxy.spec

@@ -55,10 +55,12 @@ Requires: rubygem(rsec) < 1
 Requires: rubygem(rb-inotify)
 # end specfile dhcp_isc_inotify Requires
 
+%if 0%{?rhel} < 10
 # start specfile krb5 Requires
 Requires: rubygem(rkerberos) >= 0.1.1
 Requires: rubygem(gssapi)
 # end specfile krb5 Requires
+%endif
 
 # start specfile libvirt Requires
 Requires: rubygem(ruby-libvirt) >= 0.6.0
@@ -171,6 +173,9 @@ ln -sv %{_tmppath} %{buildroot}%{_datadir}/%{name}/tmp
 %attr(-,%{name},%{name}) %{_sharedstatedir}/%{name}
 %attr(-,%{name},%{name}) %{_rundir}/%{name}
 %attr(-,%{name},root) %{_datadir}/%{name}/config.ru
+%if 0%{?rhel} == 10
+%exclude %{_datadir}/%{name}/bundler.d/krb5.rb
+%endif
 %exclude %{_datadir}/%{name}/bundler.d/development.rb
 %exclude %{_datadir}/%{name}/bundler.d/test.rb
 %exclude %{_datadir}/%{name}/bundler.d/windows.rb