Update to 1.48.0 upstream release

Upstream tag: 1.48.0
Upstream commit: c8f19402

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

.gitignore

@@ -63,23 +63,3 @@
 /tmt-1.46.0.tar.gz
 /tmt-1.47.0.tar.gz
 /tmt-1.48.0.tar.gz
-/tmt-1.49.0.tar.gz
-/tmt-1.50.0.tar.gz
-/tmt-1.51.0.tar.gz
-/tmt-1.52.0.tar.gz
-/tmt-1.53.0.tar.gz
-/tmt-1.54.0.tar.gz
-/tmt-1.55.0.tar.gz
-/tmt-1.56.0.tar.gz
-/tmt-1.57.0.tar.gz
-/tmt-1.58.0.tar.gz
-/tmt-1.59.0.tar.gz
-/tmt-1.60.0.tar.gz
-/tmt-1.61.0.tar.gz
-/tmt-1.62.1.tar.gz
-/tmt-1.63.0.tar.gz
-/tmt-1.64.0.tar.gz
-/tmt-1.65.0.tar.gz
-/tmt-1.66.0.tar.gz
-/tmt-1.67.0.tar.gz
-/tmt-1.68.0.tar.gz

.packit.yaml

@@ -1,21 +1,6 @@
----
-
-specfile_path: packaging/rpm/tmt.spec
+specfile_path: tmt.spec
 files_to_sync:
-  - src: packaging/rpm/
-    dest: ./
-    delete: true
-    filters:
-      - "protect .git*"
-      - "protect sources"
-      - "protect changelog"
-      - "protect README*"
-      # TODO: remove once https://github.com/fedora-ci/jenkins-pipeline-library/pull/100 is merged
-      - "protect ci.fmf"
-  - src: packaging/
-    dest: ./
-    filters:
-      - "- rpm"
+  - tmt.spec
   - .packit.yaml
 
 upstream_package_name: tmt
@@ -30,15 +15,15 @@ srpm_build_deps:
 
 actions: &base-actions
   create-archive:
+    - hatch run docs:man
     - hatch build -t sdist
-    - bash -c "echo dist/tmt-$PACKIT_PROJECT_VERSION.tar.gz"
+    - bash -c "ls dist/tmt-*.tar.gz"
   get-current-version:
     - hatch version
 
 targets: &all-targets
   - fedora-all
   - epel-9
-  - epel-10
 
 # Uncomment below line if OpenScanHub scans are failing
 # osh_diff_scan_after_copr_build: false
@@ -55,8 +40,8 @@ _:
   # Copr jobs under the teemtee project
   - &copr-under-teemtee
     <<: *copr-under-packit
-    list_on_homepage: true
-    preserve_project: true
+    list_on_homepage: True
+    preserve_project: True
     owner: "@teemtee"
 
   # Test jobs base setup
@@ -67,25 +52,19 @@ _:
       environments:
         - &copr-teemtee-stable
           artifacts:
-            # Testing Farm fails to install the repository when a multiline
-            # string is used. The script looks broken, as if one piece of
-            # the process incorrectly loads it, producing broken repo file
-            # URL.
             - type: repository-file
-              # yamllint disable-line rule:line-length
               id: https://copr.fedorainfracloud.org/coprs/g/teemtee/stable/repo/fedora-rawhide/group_teemtee-stable-fedora-rawhide.repo
             - type: repository-file
-              # yamllint disable-line rule:line-length
               id: https://copr.fedorainfracloud.org/coprs/g/teemtee/stable/repo/epel-9/group_teemtee-stable-epel-9.repo
 
   # Latest fedora & epel targets
   - &latest-targets
     - fedora-latest-stable
-    - epel-10
+    - epel-9
 
   # Internal jobs
   - &internal
-    use_internal_tf: true
+    use_internal_tf: True
     targets:
       - fedora-latest-stable
     tf_extra_params:
@@ -97,13 +76,6 @@ _:
               tags:
                 BusinessUnit: tmt
 
-  # Core test requires
-  - &require-core-tests
-    require:
-      label:
-        absent:
-          - ci | skip
-
   # Full test requires
   - &require-full-tests
     require:
@@ -112,19 +84,7 @@ _:
           - ci | full test
         absent:
           - status | discuss
-          - ci | skip
 
-  # Internal provisioning jobs
-  - &internal-provision
-    <<: *test-base
-    <<: *internal
-    <<: *require-full-tests
-    tf_extra_params:
-      environments:
-        - tmt:
-            context:
-              how: provision
-          <<: *tmt-cloud-resources
 
 jobs:
   # Build released bits to stable
@@ -145,10 +105,9 @@ jobs:
 
   # Test core
   - <<: *test-base
-    <<: *require-core-tests
     targets: *latest-targets
     identifier: core
-    tmt_plan: '/plans/features/core'
+    tmt_plan: '/plans/features/(core|basic)'
 
   # Test full
   - <<: *test-base
@@ -161,19 +120,22 @@ jobs:
   # Extended unit tests
   - <<: *test-base
     <<: *require-full-tests
-    targets:
-      - fedora-latest-stable
+    targets: [ fedora-latest-stable ]
     identifier: extended-unit-tests
     tmt_plan: '/plans/features/extended-unit-tests$'
 
-  # Test provision plugins
-  - <<: *internal-provision
-    identifier: provision-bootc
-    tmt_plan: /plans/provision/bootc
-
-  - <<: *internal-provision
-    identifier: provision-virtual
-    tmt_plan: /plans/provision/virtual
+  # Test virtual & bootc provision plugins
+  - <<: *test-base
+    <<: *internal
+    <<: *require-full-tests
+    identifier: provision
+    tmt_plan: '/plans/provision/(bootc|virtual)'
+    tf_extra_params:
+      environments:
+        - tmt:
+            context:
+              how: provision
+          <<: *tmt-cloud-resources
 
   # Test internal plugins
   - <<: *test-base
@@ -190,45 +152,10 @@ jobs:
     fmf_url: "https://gitlab.cee.redhat.com/baseos-qe/integration_scripts.git"
     tmt_plan: '/tmt/integration/plan'
 
-  # Run missing tests identified in Connect
-  - <<: *test-base
-    <<: *internal
-    <<: *require-full-tests
-    identifier: internal-fusa
-    fmf_url: "https://gitlab.cee.redhat.com/automotive/tests/all.git"
-    fmf_ref: "main"
-    tmt_plan: '/tmt/plans/fusa/tests'
-    targets:
-      - epel-9
-
-  # OS-agnostic sanity and coding-standard checks
-  - <<: *test-base
-    targets:
-      - fedora-latest-stable
-    identifier: sanity
-    tf_extra_params:
-      test:
-        tmt:
-          name: /plans/sanity
-    skip_build: true
-
-  # Downstream tests
-  - <<: *test-base
-    <<: *require-full-tests
-    targets:
-      - fedora-latest-stable
-    identifier: downstream
-    fmf_path: packaging
-
   # Propose downstream pull requests
   - job: propose_downstream
     trigger: release
-    dist_git_branches:
-      rawhide:
-        fast_forward_merge_into:
-          - fedora-branched
-          - epel-10
-          - epel-9
+    dist_git_branches: *all-targets
 
   # Create koji builds
   - job: koji_build
@@ -242,4 +169,3 @@ jobs:
     dist_git_branches:
       - fedora-branched
       - epel-9
-      - epel-10

3148.patch

@@ -0,0 +1,22 @@
+From 2a29a77e110a49d8971b6374ef8c8a48be431157 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Petr=20=C5=A0pl=C3=ADchal?= <psplicha@redhat.com>
+Date: Wed, 14 Aug 2024 15:19:26 +0200
+Subject: [PATCH] Fix getting excluded variables from environment variable
+
+---
+ tmt/steps/report/reportportal.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/tmt/steps/report/reportportal.py b/tmt/steps/report/reportportal.py
+index bdd3f0d790..7c6418050e 100644
+--- a/tmt/steps/report/reportportal.py
++++ b/tmt/steps/report/reportportal.py
+@@ -140,7 +140,7 @@ class ReportReportPortalData(tmt.steps.report.ReportStepData):
+     exclude_variables: str = field(
+         option="--exclude-variables",
+         metavar="PATTERN",
+-        default=_str_env_to_default('defect_type', "^TMT_.*"),
++        default=_str_env_to_default('exclude_variables', "^TMT_.*"),
+         help="""
+              Regular expression for excluding environment variables
+              from reporting to ReportPortal ('^TMT_.*' used by default).

README.packit

@@ -1,3 +1,3 @@
 This repository is maintained by packit.
 https://packit.dev/
-The file was generated using packit 1.15.0.post1.dev2+g8f2adf816.
+The file was generated using packit 1.6.0.post1.dev2+gd5a7662a.

dnf5-support.patch

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

plans/minimal.fmf

@@ -3,10 +3,7 @@ discover:
     tests:
       - name: /install/minimal
         test: cd $(mktemp -d) && tmt init -t full && tmt
-        require:
-          - tmt
 prepare:
-    # TODO: Remove when artifact installation is live
     summary: Ensure that only 'tmt' is installed
     name: minimal
     order: 90

plans/upstream.fmf

@@ -2,22 +2,19 @@ summary: Run a basic set of upstream tests
 
 discover:
     how: fmf
-    # Using a hack for when running in upstream where it is able to
-    # discover tests from outside the current fmf tree.
-    # https://github.com/teemtee/tmt/issues/2568
-    path: .
+    url: https://github.com/teemtee/tmt
+    ref: fedora
     filter: "tier:1"
 
-prepare:
+prepare+:
   - how: install
     package:
       - jq
-      - yq
+      - python3-pip
+  - how: shell
+    script:
+      - pip3 install --user yq || pip3 install yq
+      - yq --help
 
 execute:
     how: tmt
-
-adjust+:
-    when: initiator == fedora-ci
-    discover+:
-        dist-git-source: true

sources

@@ -1 +1 @@
-SHA512 (tmt-1.68.0.tar.gz) = 1c64f6c2648516fcc0abbc097970d8decd49cf5f22e9d165b2a1121dca4a2d54013d06f6de0ea4f9aa1a22a21f2eae4c261a9a456733c666fb4c8bc6ec60b2d3
+SHA512 (tmt-1.48.0.tar.gz) = af3ac73d2664a4d2f18904d0c384c99ee30594225eba80e0da2c6678fd770edd05bb07b2bc2bcb8abf9f86b4bda2bc751d54a44fdfe4b210cc2cd693fadd5af8