Skip to content

Commit

Permalink
ci: Fix Fedora tests (#1050)
Browse files Browse the repository at this point in the history
* Switch to tmt downstream plans

Signed-off-by: Cristian Le <cristian.le@mpsd.mpg.de>

* Move to `fedora-all` targets

Signed-off-by: Cristian Le <cristian.le@mpsd.mpg.de>

* Simplify packit configuration

Signed-off-by: Cristian Le <cristian.le@mpsd.mpg.de>

* Fix warning filter

Signed-off-by: Cristian Le <cristian.le@mpsd.mpg.de>

* Fix rpmlint issue

Signed-off-by: Cristian Le <cristian.le@mpsd.mpg.de>

---------

Signed-off-by: Cristian Le <cristian.le@mpsd.mpg.de>
  • Loading branch information
LecrisUT committed Jan 25, 2024
1 parent 030e6c2 commit 725c09b
Show file tree
Hide file tree
Showing 7 changed files with 34 additions and 58 deletions.
3 changes: 0 additions & 3 deletions .distro/packit.toml

This file was deleted.

10 changes: 10 additions & 0 deletions .distro/plans/rpminspect.fmf
@@ -0,0 +1,10 @@
plan:
import:
url: https://github.com/packit/tmt-plans
ref: main
name: /plans/rpminspect
environment:
# upstream is excluded here because it triggers "Unexpected changed source archive content"
# This happens when the released version already contains the package version:
# https://github.com/packit/tmt-plans/issues/13
RPMINSPECT_EXCLUDE: metadata,upstream
22 changes: 6 additions & 16 deletions .distro/plans/rpmlint.fmf
@@ -1,20 +1,10 @@
summary:
Perform rpmlint and rpminspect tests
prepare:
- name: Install rpmlint packages
how: install
package:
- rpmlint
- rpminspect
- rpminspect-data-fedora
#- 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}
discover+:
- how: shell
script: cp ./*.rpmlintrc $TMT_PLAN_DATA/
discover:
how: fmf
filter: "tag: rpmlint"
url: https://github.com/packit/tmt-plans
ref: main
execute:
how: tmt
how: tmt
2 changes: 1 addition & 1 deletion .distro/python-scikit-build.spec
Expand Up @@ -25,7 +25,7 @@ BuildRequires: ninja-build
Improved build system generator for CPython C/C++/Fortran/Cython extensions.
Better support is available for additional compilers, build systems, cross
compilation, and locating dependencies and determining their build requirements.
The scikit-build package is fundamentally just glue between the setuptools
The scikit-build package is fundamentally just glue between the setup-tools
Python module and CMake.}

%description %_description
Expand Down
13 changes: 0 additions & 13 deletions .distro/tests/rpmlint.fmf

This file was deleted.

40 changes: 16 additions & 24 deletions .packit.yaml
Expand Up @@ -4,19 +4,13 @@
specfile_path: .distro/python-scikit-build.spec

files_to_sync:
- src: .distro/python-scikit-build.spec
dest: python-scikit-build.spec
- .packit.yaml
- src: .distro/python-scikit-build.rpmlintrc
dest: python-scikit-build.rpmlintrc
# tmt setup
- src: .distro/.fmf/
dest: .fmf/
- src: .distro/plans/
dest: plans/
- src: .distro/
dest: ./
filters:
- "- main.fmf.dist-git"
- "- rpmlint.fmf"
- "- plans/main.fmf.dist-git"
- "- plans/rpminspect.fmf"
- "- plans/rpmlint.fmf"
- .packit.yaml
- src: .distro/plans/main.fmf.dist-git
dest: plans/main.fmf
upstream_package_name: scikit-build
Expand All @@ -31,38 +25,36 @@ jobs:
update_release: true
release_suffix: "{PACKIT_RPMSPEC_RELEASE}"
targets:
- fedora-development
- fedora-all-x86_64
- fedora-all-aarch64
- job: tests
trigger: pull_request
targets:
- fedora-development
- fedora-all-x86_64
- fedora-all-aarch64
fmf_path: .distro
- job: copr_build
trigger: commit
branch: main
owner: "@scikit-build"
project: nightly
targets:
- fedora-development-x86_64
- fedora-latest-x86_64
- fedora-development-aarch64
- fedora-latest-aarch64
- fedora-all-x86_64
- fedora-all-aarch64
- job: tests
trigger: commit
branch: main
targets:
- fedora-development
- fedora-latest
- fedora-all-x86_64
- fedora-all-aarch64
fmf_path: .distro
- job: copr_build
trigger: release
owner: "@scikit-build"
project: release
targets:
- fedora-development-x86_64
- fedora-latest-x86_64
- fedora-development-aarch64
- fedora-latest-aarch64
- fedora-all-x86_64
- fedora-all-aarch64
- job: propose_downstream
trigger: release
dist_git_branches:
Expand Down
2 changes: 1 addition & 1 deletion pyproject.toml
Expand Up @@ -181,7 +181,7 @@ filterwarnings = [
"ignore:Config variable 'WITH_PYMALLOC' is unset, Python ABI tag may be incorrect:RuntimeWarning",
'default:shell/Perl-style subs.* are deprecated:DeprecationWarning',
'default:subprocess .* is still running:ResourceWarning',
'ignore: pkg_resources is deprecated as an API:DeprecationWarning:setuptools',
'ignore:pkg_resources is deprecated as an API:DeprecationWarning',
'ignore:onerror argument is deprecated, use onexc instead:DeprecationWarning', # Caused by wheel and Python 3.12
'ignore:(ast.Str|Attribute s|ast.NameConstant|ast.Num) is deprecated:DeprecationWarning:_pytest',
]
Expand Down

0 comments on commit 725c09b

Please sign in to comment.