update Requires

Upstream tag: 1.68.0
Upstream commit: ebf609c6

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

.gitignore

@@ -43,3 +43,43 @@
 /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
+/tmt-1.40.0.tar.gz
+/tmt-1.41.0.tar.gz
+/tmt-1.41.1.tar.gz
+/tmt-1.42.1.tar.gz
+/tmt-1.43.0.tar.gz
+/tmt-1.44.0.tar.gz
+/tmt-1.45.0.tar.gz
+/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,8 +1,22 @@
-specfile_path: tmt.spec
+---
+
+specfile_path: packaging/rpm/tmt.spec
 files_to_sync:
-  - tmt.spec
+  - 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"
   - .packit.yaml
-sync_changelog: true
 
 upstream_package_name: tmt
 downstream_package_name: tmt
@@ -14,157 +28,218 @@ srpm_build_deps:
   - hatch
   - python3-hatch-vcs
 
+actions: &base-actions
+  create-archive:
+    - hatch build -t sdist
+    - bash -c "echo dist/tmt-$PACKIT_PROJECT_VERSION.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
+
+
+# Common definitions
+_:
+  # Copr jobs under the packit project
+  - &copr-under-packit
+    job: copr_build
+    additional_repos:
+      - copr://@teemtee/stable
+
+  # Copr jobs under the teemtee project
+  - &copr-under-teemtee
+    <<: *copr-under-packit
+    list_on_homepage: true
+    preserve_project: true
+    owner: "@teemtee"
+
+  # Test jobs base setup
+  - &test-base
+    job: tests
+    trigger: pull_request
+    tf_extra_params:
+      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
+
+  # Internal jobs
+  - &internal
+    use_internal_tf: true
+    targets:
+      - fedora-latest-stable
+    tf_extra_params:
+      environments:
+        - &tmt-cloud-resources
+          <<: *copr-teemtee-stable
+          settings:
+            provisioning:
+              tags:
+                BusinessUnit: tmt
+
+  # Core test requires
+  - &require-core-tests
+    require:
+      label:
+        absent:
+          - ci | skip
+
+  # Full test requires
+  - &require-full-tests
+    require:
+      label:
+        present:
+          - 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
+  - <<: *copr-under-teemtee
+    trigger: release
+    project: stable
 
-  # Build pull requests
-  - job: copr_build
-    trigger: pull_request
-    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-all
-      - epel-9
-    tf_extra_params:
-        test:
-            tmt:
-                name: /plans/features/(core|basic)
-
-  # Test pull requests (full)
-  - job: tests
-    identifier: full
-    trigger: pull_request
-    manual_trigger: true
-    targets:
-      - fedora-all
-      - epel-9
-
-  # Test pull requests (provision)
-  - job: tests
-    identifier: provision
-    trigger: pull_request
-    manual_trigger: true
-    use_internal_tf: True
-    targets:
-      - fedora-latest-stable
-    tf_extra_params:
-        test:
-            tmt:
-                name: /plans/provision/virtual
-        environments:
-          - tmt:
-                context:
-                    how: provision
-
-  # Test internal plugins
-  - job: tests
-    trigger: pull_request
-    identifier: "internal-plugins"
-    targets:
-      - fedora-latest-stable
-    use_internal_tf: True
-    fmf_url: "https://gitlab.cee.redhat.com/baseos-qe/tmt.git"
-    # Tag cloud resources for tmt
-    tf_extra_params:
-        environments:
-          - settings:
-                provisioning:
-                    tags:
-                        BusinessUnit: tmt
-
-  # Test internal wow
-  - job: tests
-    trigger: pull_request
-    identifier: "internal-wow"
-    targets:
-      - fedora-latest-stable
-    use_internal_tf: True
-    fmf_url: "https://gitlab.cee.redhat.com/baseos-qe/integration_scripts.git"
-    tmt_plan: "/tmt/integration/plan"
-    tf_extra_params:
-        environments:
-          - settings:
-                provisioning:
-                    tags:
-                        BusinessUnit: tmt
-
-  # Build commits to main
-  - job: copr_build
+  # Build commits merged to main to latest
+  - <<: *copr-under-teemtee
     trigger: commit
     branch: main
-    targets:
-      - fedora-all
-      - epel-9
-    enable_net: False
-    list_on_homepage: True
-    preserve_project: True
-    owner: "@teemtee"
-    project: tmt
+    project: latest
     release_suffix: "{PACKIT_PROJECT_BRANCH}"
-    actions:
-        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
-  - job: copr_build
-    trigger: release
+  # Build pull requests
+  - <<: *copr-under-packit
+    trigger: pull_request
+
+  # Test core
+  - <<: *test-base
+    <<: *require-core-tests
+    targets: *latest-targets
+    identifier: core
+    tmt_plan: '/plans/features/core'
+
+  # Test full
+  - <<: *test-base
+    <<: *require-full-tests
+    identifier: full
+    # Do not run extended unit tests. That plan gets its own job
+    # because of podman vs systemd-resolved flakiness.
+    tmt_plan: '^(?!/plans/features/extended-unit-tests).*$'
+
+  # Extended unit tests
+  - <<: *test-base
+    <<: *require-full-tests
     targets:
-      - fedora-all
-      - epel-9
-    enable_net: False
-    list_on_homepage: True
-    preserve_project: True
-    owner: "@teemtee"
-    project: tmt
-    actions:
-        create-archive:
-          - hatch run docs:man
-          - hatch build -t sdist
-          - bash -c "ls dist/tmt-*.tar.gz"
-        get-current-version:
-          - hatch version
+      - fedora-latest-stable
+    identifier: extended-unit-tests
+    tmt_plan: '/plans/features/extended-unit-tests$'
 
-  # Fedora releases
+  # Test provision plugins
+  - <<: *internal-provision
+    identifier: provision-bootc
+    tmt_plan: /plans/provision/bootc
+
+  - <<: *internal-provision
+    identifier: provision-virtual
+    tmt_plan: /plans/provision/virtual
+
+  # Test internal plugins
+  - <<: *test-base
+    <<: *internal
+    <<: *require-full-tests
+    identifier: internal-plugins
+    fmf_url: "https://gitlab.cee.redhat.com/baseos-qe/tmt.git"
+
+  # Test internal wow
+  - <<: *test-base
+    <<: *internal
+    <<: *require-full-tests
+    identifier: internal-wow
+    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:
-      - fedora-all
-      - epel-9
+      rawhide:
+        fast_forward_merge_into:
+          - fedora-branched
+          - epel-10
+          - epel-9
 
+  # Create koji builds
   - job: koji_build
     trigger: commit
-    allowed_pr_authors: ["packit", "psss", "lzachar"]
-    allowed_committers: ["packit", "psss", "lzachar"]
-    dist_git_branches:
-      - fedora-all
-      - epel-9
+    allowed_pr_authors: ["packit", "all_committers"]
+    dist_git_branches: *all-targets
 
+  # Create bodhi updates
   - job: bodhi_update
     trigger: commit
     dist_git_branches:
       - fedora-branched
       - epel-9
+      - epel-10

README.packit

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

dnf5-support.patch

@@ -1,66 +0,0 @@
---- 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,7 +3,10 @@ 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,19 +2,22 @@ summary: Run a basic set of upstream tests
 
 discover:
     how: fmf
-    url: https://github.com/teemtee/tmt
-    ref: fedora
+    # 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: .
     filter: "tier:1"
 
-prepare+:
+prepare:
   - how: install
     package:
       - jq
-      - python3-pip
-  - how: shell
-    script:
-      - pip3 install --user yq || pip3 install yq
-      - yq --help
+      - yq
 
 execute:
     how: tmt
+
+adjust+:
+    when: initiator == fedora-ci
+    discover+:
+        dist-git-source: true

sources

@@ -1 +1 @@
-SHA512 (tmt-1.31.0.tar.gz) = 339ace3550697e3e704e1f189578c7c24bc80dec3aa3bf9621b3c57eda38c16dbcaf24b476e0378ee789b9d18bb030adf72d9df2751e77acacbfdab5e8875d3f
+SHA512 (tmt-1.68.0.tar.gz) = 1c64f6c2648516fcc0abbc097970d8decd49cf5f22e9d165b2a1121dca4a2d54013d06f6de0ea4f9aa1a22a21f2eae4c261a9a456733c666fb4c8bc6ec60b2d3