ci: rpm inspect test failures (scikit-build#986)

* Disable rpminspect of srpms Signed-off-by: Cristian Le <cristian.le@mpsd.mpg.de> * Improve rpmlint test Should pass all spec and rpms that should be linted together like downstream zuul test does. Otherwise, it will trigger unused filter errors Signed-off-by: Cristian Le <cristian.le@mpsd.mpg.de> --------- Signed-off-by: Cristian Le <cristian.le@mpsd.mpg.de>
holzschu · May 19, 2023 · d9d795a · d9d795a
1 parent 3e8ec2b
commit d9d795a
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 9 deletions.
diff --git a/.distro/plans/rpmlint.fmf b/.distro/plans/rpmlint.fmf
@@ -7,9 +7,9 @@ prepare:
     - rpmlint
     - rpminspect
     - rpminspect-data-fedora
-  - name: Download the source rpm
-    how: shell
-    script: cd /tmp && curl -O ${PACKIT_SRPM_URL}
+  #- name: Download the source rpm
+  #  how: shell
+  #  script: cd /tmp && curl -O ${PACKIT_SRPM_URL}
   - name: Download rpm packages
     how: shell
     script: cd /tmp && dnf download ${PACKIT_COPR_RPMS}

diff --git a/.distro/tests/rpmlint.fmf b/.distro/tests/rpmlint.fmf
@@ -5,12 +5,9 @@ tier: 0
 path: /
 
 # Define tests
-/rpmlint-spec:
-  summary: Rpmlint the spec files
-  test: rpmlint ./python-scikit-build.spec
-/rpmlint-rpms:
-  summary: Rpmlint the rpms
-  test: rpmlint -c packit.toml /tmp/*.rpm
+/rpmlint:
+  summary: Rpmlint spec and rpmfiles
+  test: rpmlint -c packit.toml -r python-scikit-build.rpmlintrc ./*.spec /tmp/*.rpm
 /rpminspect-rpms:
   summary: Rpminspect the rpms
   test: ls /tmp/*.rpm | xargs -L1 rpminspect-fedora -E metadata,disttag