Update to 1.33.0 upstream release

Upstream tag: 1.33.0
Upstream commit: a47645ca

Commit authored by Packit automation (https://packit.dev/)

.gitignore

@@ -46,10 +46,3 @@
 /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

.packit.yaml

@@ -2,6 +2,7 @@ specfile_path: tmt.spec
 files_to_sync:
   - tmt.spec
   - .packit.yaml
+sync_changelog: true
 
 upstream_package_name: tmt
 downstream_package_name: tmt
@@ -13,156 +14,198 @@ 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
+  # Build pull requests
+  - job: copr_build
     trigger: pull_request
-    targets: &latest-targets
+    targets:
+      - fedora-all
+      - epel-9
+    enable_net: False
+    actions:
+        create-archive:
+          - hatch run docs:man
+          - hatch build -t sdist
+          - bash -c "ls dist/tmt-*.tar.gz"
+        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 pull requests (core)
+  - job: tests
+    identifier: core
+    trigger: pull_request
+    targets:
       - fedora-latest-stable
       - epel-9
-    identifier: core
     tf_extra_params:
-      test:
-        tmt:
-          name: /plans/features/(core|basic)
+        test:
+            tmt:
+                name: /plans/features/(core|basic)
 
-  # Test full
+  # Test pull requests (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
+  - job: tests
     identifier: full
+    trigger: pull_request
+    targets:
+      - fedora-all
+      - epel-9
+    require:
+        label:
+          present:
+            - full test
+          absent:
+            - discuss
     tf_extra_params:
-      test:
-        tmt:
-          name: '^(?!/plans/features/extended-unit-tests).*$'
+        test:
+            tmt:
+                name: '^(?!/plans/features/extended-unit-tests).*$'
 
-  # Extended unit tests
-  - <<: *tests
-    targets: [ fedora-latest-stable ]
-    require: *require-full-tests
+  - job: 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
+    trigger: pull_request
+    targets:
       - fedora-latest-stable
-    require: *require-full-tests
-    identifier: provision
+    require:
+        label:
+          present:
+            - full test
+          absent:
+            - discuss
     tf_extra_params:
-      test:
-        tmt:
-          name: /plans/provision/(bootc|virtual)
-      environments:
-        - tmt:
-            context:
-              how: provision
-        - &tmt-cloud-resources
-          settings:
-            provisioning:
-              tags:
-                BusinessUnit: tmt
+        test:
+            tmt:
+                name: '/plans/features/extended-unit-tests$'
+
+  # Test pull requests (provision)
+  - job: tests
+    identifier: provision
+    trigger: pull_request
+    use_internal_tf: True
+    targets:
+      - fedora-latest-stable
+    tf_extra_params:
+        test:
+            tmt:
+                name: /plans/provision/virtual
+        environments:
+          - tmt:
+                context:
+                    how: provision
+    require:
+        label:
+          present:
+            - full test
+          absent:
+            - discuss
 
   # Test internal plugins
-  - <<: *tests
+  - job: tests
+    trigger: pull_request
+    identifier: "internal-plugins"
+    targets:
+      - fedora-latest-stable
     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
+        environments:
+          - settings:
+                provisioning:
+                    tags:
+                        BusinessUnit: tmt
+    require:
+        label:
+          present:
+            - full test
+          absent:
+            - discuss
 
   # Test internal wow
-  - <<: *tests
+  - job: tests
+    trigger: pull_request
+    identifier: "internal-wow"
+    targets:
+      - fedora-latest-stable
     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
+        environments:
+          - settings:
+                provisioning:
+                    tags:
+                        BusinessUnit: tmt
+    require:
+        label:
+          present:
+            - full test
+          absent:
+            - discuss
 
   # Build commits to main
-  - <<: *copr_build
+  - job: copr_build
     trigger: commit
     branch: main
+    targets:
+      - fedora-all
+      - epel-9
+    enable_net: False
     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/'"
+        create-archive:
+          - hatch run docs:man
+          - hatch build -t sdist
+          - bash -c "ls dist/tmt-*.tar.gz"
+        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
+  - job: copr_build
     trigger: release
+    targets:
+      - fedora-all
+      - epel-9
+    enable_net: False
     list_on_homepage: True
     preserve_project: True
     owner: "@teemtee"
     project: tmt
-    actions: *base-actions
+    actions:
+        create-archive:
+          - hatch run docs:man
+          - hatch build -t sdist
+          - bash -c "ls dist/tmt-*.tar.gz"
+        get-current-version:
+          - hatch version
 
   # Fedora releases
   - job: propose_downstream
     trigger: release
-    dist_git_branches: *all-targets
+    dist_git_branches:
+      - fedora-all
+      - epel-9
 
   - job: koji_build
     trigger: commit
-    allowed_pr_authors: [ "packit", "psss", "lzachar" ]
-    allowed_committers: [ "packit", "psss", "lzachar" ]
-    dist_git_branches: *all-targets
+    allowed_pr_authors: ["packit", "psss", "lzachar"]
+    allowed_committers: ["packit", "psss", "lzachar"]
+    dist_git_branches:
+      - fedora-all
+      - epel-9
 
   - job: bodhi_update
     trigger: commit

README.packit

@@ -1,3 +1,3 @@
 This repository is maintained by packit.
 https://packit.dev/
-The file was generated using packit 0.104.0.
+The file was generated using packit 0.96.0.post1.dev4+gc5b1ea8e.

dnf5-support.path

@@ -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')
+                 ])

sources

@@ -1 +1 @@
-SHA512 (tmt-1.39.0.tar.gz) = 859707d9bb9378abd1fa266f215e204995c4d811f7ddff5dcc6e12a0ec0c511e01f91deac3a6284abb10aa12a8ef5a65c344265bb6169ec5ca929d9216fccbb8
+SHA512 (tmt-1.33.0.tar.gz) = 9a39e5f5d6aae26f3a793f8f0f5a95a3a1f323135a31babf8772d5011cc94ffda662c4b7ed3ad7fe6397452d896004051f7f8f57518cfe3c96083c10b9d97af7

tmt.spec

@@ -1,5 +1,5 @@
 Name:           tmt
-Version:        1.39.0
+Version:        1.33.0
 Release:        %autorelease
 Summary:        Test Management Tool
 
@@ -12,26 +12,16 @@ BuildRequires:  python3-devel
 
 Requires:       git-core rsync sshpass
 
-%if 0%{?fedora} < 40
 Obsoletes:      python3-tmt < %{version}-%{release}
-Provides:       tmt-report-html == %{version}-%{release}
 Obsoletes:      tmt-report-html < %{version}-%{release}
-Provides:       tmt-report-junit == %{version}-%{release}
 Obsoletes:      tmt-report-junit < %{version}-%{release}
-Provides:       tmt-report-polarion == %{version}-%{release}
 Obsoletes:      tmt-report-polarion < %{version}-%{release}
-Provides:       tmt-report-reportportal == %{version}-%{release}
 Obsoletes:      tmt-report-reportportal < %{version}-%{release}
-%endif
 
 Recommends:     bash-completion
 
 %py_provides    python3-tmt
 
-%global _metapackage_description %{expand:
-This is a metapackage bringing in extra dependencies for tmt.
-It contains no code, just makes sure the dependencies are installed.}
-
 %description
 The tmt Python module and command line tool implement the test
 metadata specification (L1 and L2) and allows easy test execution.
@@ -39,14 +29,10 @@ metadata specification (L1 and L2) and allows easy test execution.
 %pyproject_extras_subpkg -n tmt export-polarion
 %pyproject_extras_subpkg -n tmt report-junit
 %pyproject_extras_subpkg -n tmt report-polarion
-%pyproject_extras_subpkg -n tmt link-jira
 
 %package -n     tmt+test-convert
 Summary:        Dependencies required for tmt test import and export
-Provides:       tmt-test-convert == %{version}-%{release}
-%if 0%{?fedora} < 40
 Obsoletes:      tmt-test-convert < %{version}-%{release}
-%endif
 Requires:       tmt == %{version}-%{release}
 Requires:       make
 Requires:       python3-bugzilla
@@ -54,28 +40,28 @@ Requires:       python3-nitrate
 Requires:       python3-html2text
 Requires:       python3-markdown
 
-%description -n tmt+test-convert %_metapackage_description
+%description -n tmt+test-convert
+This is a metapackage bringing in extra dependencies for tmt.
+It contains no code, just makes sure the dependencies are installed.
 
 %package -n     tmt+provision-container
 Summary:        Dependencies required for tmt container provisioner
-Provides:       tmt-provision-container == %{version}-%{release}
-%if 0%{?fedora} < 40
 Obsoletes:      tmt-provision-container < %{version}-%{release}
-%endif
+Obsoletes:      tmt-container < 0.17
 Requires:       tmt == %{version}-%{release}
 Requires:       podman
 Requires:       (ansible or ansible-collection-containers-podman)
 
-%description -n tmt+provision-container %_metapackage_description
+%description -n tmt+provision-container
+This is a metapackage bringing in extra dependencies for tmt.
+It contains no code, just makes sure the dependencies are installed.
 
 %package -n     tmt+provision-virtual
 Summary:        Dependencies required for tmt virtual machine provisioner
-Provides:       tmt-provision-virtual == %{version}-%{release}
-%if 0%{?fedora} < 40
 Obsoletes:      tmt-provision-virtual < %{version}-%{release}
-%endif
+Obsoletes:      tmt-testcloud < 0.17
 Requires:       tmt == %{version}-%{release}
-Requires:       python3-testcloud >= 0.11.3
+Requires:       python3-testcloud >= 0.9.10
 Requires:       libvirt-daemon-config-network
 Requires:       openssh-clients
 Requires:       (ansible or ansible-core)
@@ -88,36 +74,26 @@ Recommends:     qemu-system-s390x-core
 Recommends:     qemu-system-x86-core
 %endif
 
-%description -n tmt+provision-virtual %_metapackage_description
-
-%package -n     tmt+provision-bootc
-Summary:        Dependencies required for tmt bootc machine provisioner
-Provides:       tmt-provision-bootc == %{version}-%{release}
-Requires:       tmt == %{version}-%{release}
-Requires:       tmt+provision-virtual == %{version}-%{release}
-Requires:       podman
-Recommends:     podman-machine
-
-%description -n tmt+provision-bootc %_metapackage_description
+%description -n tmt+provision-virtual
+This is a metapackage bringing in extra dependencies for tmt.
+It contains no code, just makes sure the dependencies are installed.
 
 %package -n     tmt+provision-beaker
 Summary:        Dependencies required for tmt beaker provisioner
 Provides:       tmt-provision-beaker == %{version}-%{release}
-%if 0%{?fedora} < 40
 Obsoletes:      tmt-provision-beaker < %{version}-%{release}
-%endif
 Requires:       tmt == %{version}-%{release}
 Requires:       python3-mrack-beaker
 
-%description -n tmt+provision-beaker %_metapackage_description
+%description -n tmt+provision-beaker
+This is a metapackage bringing in extra dependencies for tmt.
+It contains no code, just makes sure the dependencies are installed.
 
 # Replace with pyproject_extras_subpkg at some point
 %package -n     tmt+all
 Summary:        Extra dependencies for the Test Management Tool
 Provides:       tmt-all == %{version}-%{release}
-%if 0%{?fedora} < 40
 Obsoletes:      tmt-all < %{version}-%{release}
-%endif
 Requires:       tmt+test-convert == %{version}-%{release}
 Requires:       tmt+export-polarion == %{version}-%{release}
 Requires:       tmt+provision-container == %{version}-%{release}
@@ -162,70 +138,12 @@ install -pm 644 %{name}/steps/provision/mrack/mrack* %{buildroot}/etc/%{name}/
 
 %files -n tmt+provision-container -f %{_pyproject_ghost_distinfo}
 %files -n tmt+provision-virtual -f %{_pyproject_ghost_distinfo}
-%files -n tmt+provision-bootc -f %{_pyproject_ghost_distinfo}
 %files -n tmt+test-convert -f %{_pyproject_ghost_distinfo}
 %files -n tmt+provision-beaker -f %{_pyproject_ghost_distinfo}
 %config(noreplace) %{_sysconfdir}/%{name}/mrack*
 %files -n tmt+all -f %{_pyproject_ghost_distinfo}
 
 %changelog
-* Fri Nov 22 2024 Packit <hello@packit.dev> - 1.39.0-1
-- Update to version 1.39.0
-
-* Fri Oct 25 2024 Packit <hello@packit.dev> - 1.38.0-1
-- Update to version 1.38.0
-
-* Wed Oct 02 2024 Packit <hello@packit.dev> - 1.37.0-1
-- Update to version 1.37.0
-
-* Fri Sep 13 2024 Packit <hello@packit.dev> - 1.36.1-1
-- Update to version 1.36.1
-
-* Thu Sep 05 2024 Packit <hello@packit.dev> - 1.36.0-1
-- Update to version 1.36.0
-
-* Fri Aug 09 2024 Packit <hello@packit.dev> - 1.35.0-1
-- Update to version 1.35.0
-
-* Mon Jun 17 2024 Martin Hoyer <mhoyer@redhat.com> - 1.34.0
-- Fix normalization of `hardware` key/option (#3015)
-- Keep patched sources directly in TMT_SOURCE_DIR (#2999)
-- Copy launch description to suite description (#2992)
-- Add support for multiple disks to testcloud plugin (#2767)
-- Improve rendering of story links in our docs (#3001)
-- Simplify parsing of HW requirements and add missing ones (#2928)
-- Make test shell wrapper filename even more unique (#2998)
-- Add support for basic rerun of tests (#2521)
-- Split provision/virtual plans to subgroups per step (#2938)
-- Document custom container images built for tmt tests (#2930)
-- Require python3.9 in 'develop' target
-- Fix multiple rules `adjust` example in `duration` spec (#2971)
-- Fix "skip missing" behavior when installig debuginfo packages with dnf (#2956)
-- Extend results schema to allow test phases (#2933)
-- Fix path to watchdog log (#2901)
-- Display locals in traceback when requested (#2900)
-- Polish test-check/dmesg documentation (#2897)
-- docs: tweak docs to include how to see details about test failures (#2541)
-- Allow multiplication in duration input value (#2845)
-- Fix validation of fmf id URL, it must be cloneable first (#2957)
-- Cover `tmt.trying` with `pyright` check (#2942)
-- Clarify the `trigger` context dimension values (#2961)
-- Add konflux as possible initiator (#2947)
-- Fix some invalid links in documentation (#2940)
-- Define "block-device" key for guest topology HW exposition
-- Cover tmt.steps.prepare.shell with pyright checks
-- Ignore report files created by pytest-html
-- Fix pre-commit typing python version (#2959)
-- Cover tmt.steps.prepare.distgit with pyright
-- Pass correct spec to _parse_system and _parse_location (#2924)
-- Support `cpu.model-name` hardware requirement for mrack (#2921)
-- Enforce "one blank line after class docstring" rule (#2934)
-- Enable pydocstyle checks in ruff (#2906)
-- Update distros in the `mrack` provisioning config (#2932)
-- Drop duplicate list of supported HW requirements in beaker plugin (#2902)
-- Update interaction with Fedora rawhide (#2931)
-- Run the `no-commit-to-branch` check only locally
-
 * Tue May 07 2024 Tomáš Bajer <tbajer@redhat.com> - 1.33.0
 - Fix installation of packages from files (#2914)
 - Simplify the documentation building (#2483)