Compare commits
37 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 14f714d9aa | |||
| 7d9e69481b | |||
| dbc74646cc | |||
| 152b6eff4d | |||
| 5b003e0a04 | |||
| 4d96f9289c | |||
| 918037c775 | |||
| ed4bc760da | |||
| c434ec1375 | |||
| 8609bbf197 | |||
| cf14d2ec99 | |||
| 65c7e58f89 | |||
| 7bc338bfe8 | |||
| defe612480 | |||
| 5baffd6f88 | |||
| 39ff27ed0e | |||
| 8a77af960c | |||
| df5d3c5ce0 | |||
| d22d551733 | |||
| 026c942cb8 | |||
| e488417c7c | |||
| 24e4a06714 | |||
| 147a09813e | |||
| d2ce4d846b | |||
| 6cef9fcb4d | |||
| 960429a4fb | |||
| 358dfd6abb | |||
| 9145fda771 | |||
| b8f07e3a74 | |||
| add2b64498 | |||
| 267fe0fbc9 | |||
| d5dae2eab0 | |||
| b60b1474b8 | |||
| fe802a9642 | |||
| a57fedc071 | |||
| 2a37959c53 | |||
| a9dc05644b |
+19
@@ -34,3 +34,22 @@
|
||||
/tmt-1.21.0.tar.gz
|
||||
/tmt-1.22.0.tar.gz
|
||||
/tmt-1.23.0.tar.gz
|
||||
/tmt-1.24.1.tar.gz
|
||||
/tmt-1.25.0.tar.gz
|
||||
/tmt-1.26.0.tar.gz
|
||||
/tmt-1.26.1.tar.gz
|
||||
/tmt-1.27.0.tar.gz
|
||||
/tmt-1.28.2.tar.gz
|
||||
/tmt-1.29.0.tar.gz
|
||||
/tmt-1.30.0.tar.gz
|
||||
/tmt-1.31.0.tar.gz
|
||||
/tmt-1.32.1.tar.gz
|
||||
/tmt-1.32.2.tar.gz
|
||||
/tmt-1.33.0.tar.gz
|
||||
/tmt-1.34.0.tar.gz
|
||||
/tmt-1.35.0.tar.gz
|
||||
/tmt-1.36.0.tar.gz
|
||||
/tmt-1.36.1.tar.gz
|
||||
/tmt-1.37.0.tar.gz
|
||||
/tmt-1.38.0.tar.gz
|
||||
/tmt-1.39.0.tar.gz
|
||||
|
||||
+171
@@ -0,0 +1,171 @@
|
||||
specfile_path: tmt.spec
|
||||
files_to_sync:
|
||||
- tmt.spec
|
||||
- .packit.yaml
|
||||
|
||||
upstream_package_name: tmt
|
||||
downstream_package_name: tmt
|
||||
|
||||
upstream_project_url: https://github.com/teemtee/tmt
|
||||
issue_repository: https://github.com/teemtee/tmt
|
||||
|
||||
srpm_build_deps:
|
||||
- hatch
|
||||
- python3-hatch-vcs
|
||||
|
||||
actions: &base-actions
|
||||
create-archive:
|
||||
- hatch run docs:man
|
||||
- hatch build -t sdist
|
||||
- bash -c "ls dist/tmt-*.tar.gz"
|
||||
get-current-version:
|
||||
- hatch version
|
||||
|
||||
targets: &all-targets
|
||||
- fedora-all
|
||||
- epel-9
|
||||
|
||||
# Uncomment below line if OpenScanHub scans are failing
|
||||
# osh_diff_scan_after_copr_build: false
|
||||
|
||||
jobs:
|
||||
# Build pull requests
|
||||
- &copr_build
|
||||
job: copr_build
|
||||
trigger: pull_request
|
||||
actions:
|
||||
<<: *base-actions
|
||||
get-current-version:
|
||||
# Use `dev888` instead of the last version digit to make
|
||||
# builds older than the final release and newer than
|
||||
# copr builds from main. Remove the remaining suffix
|
||||
# generated by `hatch version` as well so that build
|
||||
# with the latest timestamp always wins.
|
||||
- bash -c "hatch version | sed -E 's/\\.[0-9]+\\.dev.*/.dev888/'"
|
||||
|
||||
# Test core
|
||||
- &tests
|
||||
job: tests
|
||||
trigger: pull_request
|
||||
targets: &latest-targets
|
||||
- fedora-latest-stable
|
||||
- epel-9
|
||||
identifier: core
|
||||
tf_extra_params:
|
||||
test:
|
||||
tmt:
|
||||
name: /plans/features/(core|basic)
|
||||
|
||||
# Test full
|
||||
# Do not run extended unit tests, that plan gets its own job because
|
||||
# of podman vs systemd-resolved flakiness.
|
||||
- <<: *tests
|
||||
targets: *all-targets
|
||||
require: &require-full-tests
|
||||
label:
|
||||
present:
|
||||
- ci | full test
|
||||
absent:
|
||||
- status | discuss
|
||||
identifier: full
|
||||
tf_extra_params:
|
||||
test:
|
||||
tmt:
|
||||
name: '^(?!/plans/features/extended-unit-tests).*$'
|
||||
|
||||
# Extended unit tests
|
||||
- <<: *tests
|
||||
targets: [ fedora-latest-stable ]
|
||||
require: *require-full-tests
|
||||
identifier: extended-unit-tests
|
||||
tf_extra_params:
|
||||
test:
|
||||
tmt:
|
||||
name: '/plans/features/extended-unit-tests$'
|
||||
|
||||
# Test virtual provision
|
||||
- <<: *tests
|
||||
use_internal_tf: True
|
||||
targets: &internal-targets
|
||||
- fedora-latest-stable
|
||||
require: *require-full-tests
|
||||
identifier: provision
|
||||
tf_extra_params:
|
||||
test:
|
||||
tmt:
|
||||
name: /plans/provision/(bootc|virtual)
|
||||
environments:
|
||||
- tmt:
|
||||
context:
|
||||
how: provision
|
||||
- &tmt-cloud-resources
|
||||
settings:
|
||||
provisioning:
|
||||
tags:
|
||||
BusinessUnit: tmt
|
||||
|
||||
# Test internal plugins
|
||||
- <<: *tests
|
||||
use_internal_tf: True
|
||||
targets: *internal-targets
|
||||
require: *require-full-tests
|
||||
identifier: internal-plugins
|
||||
fmf_url: "https://gitlab.cee.redhat.com/baseos-qe/tmt.git"
|
||||
# Tag cloud resources for tmt
|
||||
tf_extra_params:
|
||||
environments:
|
||||
- *tmt-cloud-resources
|
||||
|
||||
# Test internal wow
|
||||
- <<: *tests
|
||||
use_internal_tf: True
|
||||
targets: *internal-targets
|
||||
require: *require-full-tests
|
||||
identifier: internal-wow
|
||||
fmf_url: "https://gitlab.cee.redhat.com/baseos-qe/integration_scripts.git"
|
||||
tmt_plan: "/tmt/integration/plan"
|
||||
tf_extra_params:
|
||||
environments:
|
||||
- *tmt-cloud-resources
|
||||
|
||||
# Build commits to main
|
||||
- <<: *copr_build
|
||||
trigger: commit
|
||||
branch: main
|
||||
list_on_homepage: True
|
||||
preserve_project: True
|
||||
owner: "@teemtee"
|
||||
project: tmt
|
||||
release_suffix: "{PACKIT_PROJECT_BRANCH}"
|
||||
actions:
|
||||
<<: *base-actions
|
||||
get-current-version:
|
||||
# Get rid of the the final version digit to make copr
|
||||
# builds older than the final release
|
||||
- bash -c "hatch version | sed -E 's/\\.[0-9]+\\.dev/.dev/'"
|
||||
|
||||
# Release to copr
|
||||
- <<: *copr_build
|
||||
trigger: release
|
||||
list_on_homepage: True
|
||||
preserve_project: True
|
||||
owner: "@teemtee"
|
||||
project: tmt
|
||||
actions: *base-actions
|
||||
|
||||
# Fedora releases
|
||||
- job: propose_downstream
|
||||
trigger: release
|
||||
dist_git_branches: *all-targets
|
||||
|
||||
- job: koji_build
|
||||
trigger: commit
|
||||
allowed_pr_authors: [ "packit", "psss", "lzachar" ]
|
||||
allowed_committers: [ "packit", "psss", "lzachar" ]
|
||||
dist_git_branches: *all-targets
|
||||
|
||||
- job: bodhi_update
|
||||
trigger: commit
|
||||
dist_git_branches:
|
||||
- fedora-branched
|
||||
- epel-9
|
||||
@@ -1,6 +1,5 @@
|
||||
# tmt
|
||||
|
||||
Test Metadata Tool
|
||||
Test Management Tool
|
||||
|
||||
* https://github.com/psss/tmt/
|
||||
* https://tmt.readthedocs.io/
|
||||
|
||||
@@ -0,0 +1,3 @@
|
||||
This repository is maintained by packit.
|
||||
https://packit.dev/
|
||||
The file was generated using packit 0.104.0.
|
||||
@@ -0,0 +1,66 @@
|
||||
--- tmt-1.24.1/tmt/steps/prepare/install.py.old 2023-06-22 11:57:06.633409186 +0200
|
||||
+++ tmt-1.24.1/tmt/steps/prepare/install.py 2023-06-22 11:57:45.239501579 +0200
|
||||
@@ -273,6 +273,7 @@ class InstallDnf(InstallBase):
|
||||
|
||||
package_manager = "dnf"
|
||||
copr_plugin = "dnf-plugins-core"
|
||||
+ skip_missing_option = "--skip-broken"
|
||||
|
||||
def prepare_command(self) -> Tuple[Command, Command]:
|
||||
""" Prepare installation command """
|
||||
@@ -290,7 +291,7 @@ class InstallDnf(InstallBase):
|
||||
command += Command(self.package_manager)
|
||||
|
||||
if self.skip_missing:
|
||||
- command += Command('--skip-broken')
|
||||
+ options += Command(self.skip_missing_option)
|
||||
|
||||
return (command, options)
|
||||
|
||||
@@ -356,6 +357,14 @@ class InstallDnf(InstallBase):
|
||||
self.guest.execute(command)
|
||||
|
||||
|
||||
+class InstallDnf5(InstallDnf):
|
||||
+ """ Install packages using dnf5 """
|
||||
+
|
||||
+ package_manager = "dnf5"
|
||||
+ copr_plugin = "dnf5-plugins"
|
||||
+ skip_missing_option = "--skip-unavailable"
|
||||
+
|
||||
+
|
||||
class InstallYum(InstallDnf):
|
||||
""" Install packages using yum """
|
||||
|
||||
@@ -592,6 +601,9 @@ class PrepareInstall(tmt.steps.prepare.P
|
||||
elif guest.facts.package_manager == GuestPackageManager.DNF:
|
||||
installer = InstallDnf(logger=logger, parent=self, guest=guest)
|
||||
|
||||
+ elif guest.facts.package_manager == GuestPackageManager.DNF5:
|
||||
+ installer = InstallDnf5(logger=logger, parent=self, guest=guest)
|
||||
+
|
||||
elif guest.facts.package_manager == GuestPackageManager.YUM:
|
||||
installer = InstallYum(logger=logger, parent=self, guest=guest)
|
||||
|
||||
--- tmt-1.24.1/tmt/steps/provision/__init__.py.old 2023-06-22 11:56:50.556370700 +0200
|
||||
+++ tmt-1.24.1/tmt/steps/provision/__init__.py 2023-06-22 11:58:00.472538032 +0200
|
||||
@@ -64,6 +64,7 @@ class CheckRsyncOutcome(enum.Enum):
|
||||
|
||||
class GuestPackageManager(enum.Enum):
|
||||
DNF = 'dnf'
|
||||
+ DNF5 = 'dnf5'
|
||||
YUM = 'yum'
|
||||
RPM_OSTREE = 'rpm-ostree'
|
||||
|
||||
@@ -274,8 +275,9 @@ class GuestFacts(tmt.utils.SerializableC
|
||||
guest,
|
||||
[
|
||||
(Command('stat', '/run/ostree-booted'), GuestPackageManager.RPM_OSTREE),
|
||||
- (Command('rpm', '-q', 'dnf'), GuestPackageManager.DNF),
|
||||
- (Command('rpm', '-q', 'yum'), GuestPackageManager.YUM),
|
||||
+ (Command('dnf5', '--version'), GuestPackageManager.DNF5),
|
||||
+ (Command('dnf', '--version'), GuestPackageManager.DNF),
|
||||
+ (Command('yum', '--version'), GuestPackageManager.YUM),
|
||||
# And, one day, we'd follow up on this with...
|
||||
# (Command('dpkg', '-l', 'apt'), 'apt')
|
||||
])
|
||||
+14
-3
@@ -1,9 +1,20 @@
|
||||
summary:
|
||||
Upstream tests working under virtual machine
|
||||
summary: Run a basic set of upstream tests
|
||||
|
||||
discover:
|
||||
how: fmf
|
||||
url: https://github.com/teemtee/tmt
|
||||
ref: fedora
|
||||
filter: "tag:virtual & tier:0,1"
|
||||
filter: "tier:1"
|
||||
|
||||
prepare+:
|
||||
- how: install
|
||||
package:
|
||||
- jq
|
||||
- python3-pip
|
||||
- how: shell
|
||||
script:
|
||||
- pip3 install --user yq || pip3 install yq
|
||||
- yq --help
|
||||
|
||||
execute:
|
||||
how: tmt
|
||||
|
||||
@@ -0,0 +1,5 @@
|
||||
---
|
||||
addedfiles:
|
||||
ignore:
|
||||
# rpminspect forbids /var/tmp prefix by default
|
||||
- /var/tmp/tmt
|
||||
@@ -1 +1 @@
|
||||
SHA512 (tmt-1.23.0.tar.gz) = 1ecc3ddd8a1700f0dca7747a3b426ff30bb95cdc5b3aaecbb6eb17485f94b4e72bbca2a390a5a55729b5c1e82388a066f68f33a698742ab1bd5ef49ab35742d2
|
||||
SHA512 (tmt-1.39.0.tar.gz) = 859707d9bb9378abd1fa266f215e204995c4d811f7ddff5dcc6e12a0ec0c511e01f91deac3a6284abb10aa12a8ef5a65c344265bb6169ec5ca929d9216fccbb8
|
||||
|
||||
Reference in New Issue
Block a user