Merge pull request #5993 from jkonecny12/rhel-10-sync-templates

RHEL-10: Sync templates from `master` branch
rhinstaller · Nov 12, 2024 · fc69f79 · fc69f79
2 parents efc7e41 + 4c08e3a
commit fc69f79
Show file tree

Hide file tree

Showing 6 changed files with 45 additions and 8 deletions.
diff --git a/.github/workflows/kickstart-tests.yml.j2 b/.github/workflows/kickstart-tests.yml.j2
@@ -274,6 +274,7 @@ jobs:
         run: |
           cat <<EOF > settings.ini
           [kickstart_test]
+          retry_on_failure=True
           kstest_local_repo=${{ github.workspace }}/kickstart-tests
           [library]
           directPath=${{ github.workspace }}/kickstart-tests/testlib

diff --git a/.packit.yml b/.packit.yml
@@ -11,6 +11,9 @@ upstream_tag_template: anaconda-{version}
 copy_upstream_release_description: true
 downstream_package_name: anaconda
 
+files_to_sync:
+  - rpmlint.toml
+
 srpm_build_deps:
   - automake
   - autoconf

diff --git a/.packit.yml.j2 b/.packit.yml.j2
@@ -4,6 +4,9 @@ upstream_tag_template: anaconda-{version}
 copy_upstream_release_description: true
 downstream_package_name: anaconda
 
+files_to_sync:
+  - rpmlint.toml
+
 srpm_build_deps:
   - automake
   - autoconf

diff --git a/dockerfile/anaconda-iso-creator/lorax-build b/dockerfile/anaconda-iso-creator/lorax-build
@@ -43,13 +43,11 @@ createrepo_c $REPO_DIR
 MAJOR_VERSION=${VERSION_ID%%.*}
 MINOR_VERSION=${VERSION_ID#*.}
 
-# FIXME: Remove COPR repository which is temporary workaround until python3-pam package is available
 lorax -p RHEL -v "$MAJOR_VERSION" -r "$MINOR_VERSION" \
       --volid "RHEL-$MAJOR_VERSION-$MINOR_VERSION-BaseOS-x86_64" \
       --nomacboot \
-      -s http://download.devel.redhat.com/rhel-10/nightly/RHEL-10-Public-Beta/latest-RHEL-10/compose/BaseOS/x86_64/os/ \
-      -s http://download.devel.redhat.com/rhel-10/nightly/RHEL-10-Public-Beta/latest-RHEL-10/compose/AppStream/x86_64/os/ \
-      -s https://download.copr.fedorainfracloud.org/results/m4rtink/python-pam-rebuild/centos-stream-10-x86_64/ \
+      -s http://download.devel.redhat.com/rhel-10/nightly/RHEL-10/latest-RHEL-10/compose/BaseOS/x86_64/os/ \
+      -s http://download.devel.redhat.com/rhel-10/nightly/RHEL-10/latest-RHEL-10/compose/AppStream/x86_64/os/ \
       -s file://$REPO_DIR/ \
       "$@" \
       output || cp *.log "$OUT_DIR"

diff --git a/dockerfile/anaconda-iso-creator/lorax-build.j2 b/dockerfile/anaconda-iso-creator/lorax-build.j2
@@ -45,13 +45,11 @@ lorax -p Fedora -v "$VERSION_ID" -r "$VERSION_ID" \
 MAJOR_VERSION=${VERSION_ID%%.*}
 MINOR_VERSION=${VERSION_ID#*.}
 
-# FIXME: Remove COPR repository which is temporary workaround until python3-pam package is available
 lorax -p RHEL -v "$MAJOR_VERSION" -r "$MINOR_VERSION" \
       --volid "RHEL-$MAJOR_VERSION-$MINOR_VERSION-BaseOS-x86_64" \
       --nomacboot \
-      -s http://download.devel.redhat.com/rhel-{$ distro_release $}/nightly/RHEL-{$ distro_release $}-Public-Beta/latest-RHEL-{$ distro_release $}/compose/BaseOS/x86_64/os/ \
-      -s http://download.devel.redhat.com/rhel-{$ distro_release $}/nightly/RHEL-{$ distro_release $}-Public-Beta/latest-RHEL-{$ distro_release $}/compose/AppStream/x86_64/os/ \
-      -s https://download.copr.fedorainfracloud.org/results/m4rtink/python-pam-rebuild/centos-stream-10-x86_64/ \
+      -s http://download.devel.redhat.com/rhel-{$ distro_release $}/nightly/RHEL-{$ distro_release $}/latest-RHEL-{$ distro_release $}/compose/BaseOS/x86_64/os/ \
+      -s http://download.devel.redhat.com/rhel-{$ distro_release $}/nightly/RHEL-{$ distro_release $}/latest-RHEL-{$ distro_release $}/compose/AppStream/x86_64/os/ \
 {% endif %}
       -s file://$REPO_DIR/ \
       "$@" \

diff --git a/rpmlint.toml b/rpmlint.toml
@@ -0,0 +1,34 @@
+# The purpose of this file is to overwrite some default config
+# of rpmlint, which may not fit our project needs / specification
+Filters = [
+    # Discard no-binary error for anaconda packages which cant be a noarch type
+    'anaconda.x86_64: E: no-binary',
+    'anaconda-install-env-deps.x86_64: E: no-binary',
+    'anaconda-install-img-deps.x86_64: E: no-binary',
+    # Discard explicite library dependencies
+    'explicit-lib-dependency flatpak-libs',
+    'explicit-lib-dependency libblockdev-lvm-dbus',
+    'explicit-lib-dependency librsvg2',
+    # Discard warning about binary debug symbols. Those are our helper
+    # binaries and it is not important for them to be stripped
+    'unstripped-binary-or-object /usr/libexec/anaconda/dd_extract',
+    'unstripped-binary-or-object /usr/libexec/anaconda/dd_list',
+    'unstripped-binary-or-object /usr/lib64/libAnacondaWidgets*',
+    'unstripped-binary-or-object /usr/lib64/glade/modules/libAnacondaWidgets*',
+    # Discard symbolic link warnings.
+    'dangling-symlink /usr/share/anaconda/window-manager/glib-2.0/schemas/org.gnome.*',
+    'dangling-relative-symlink /usr/lib/.build-id/*',
+    # Discard missing manual pages error
+    'no-manual-page-for-binary liveinst',
+    'no-manual-page-for-binary anaconda-cleanup',
+    'no-manual-page-for-binary anaconda-disable-nm-ibft-plugin',
+    'no-manual-page-for-binary anaconda-nm-disable-autocons',
+    'no-manual-page-for-binary instperf',
+    'no-manual-page-for-binary instperf',
+    'no-manual-page-for-binary anaconda',
+    'no-manual-page-for-binary handle-sshpw',
+    # Discard missing README / documentation for package
+    'no-documentation',
+    # Discard spelling errors for project commonly used words
+    'spelling-error .* en_US (metapackage|kickstarts|iso|eg|lorax) ',
+]