Move RHEL branch from Cirrus to TMT

Signed-off-by: Lokesh Mandvekar <[email protected]>

Author: lsm5

.packit-copr-rpm.sh

@@ -0,0 +1,36 @@
+#!/usr/bin/env bash
+
+# This script handles any custom processing of the spec file using the `fix-spec-file`
+# action in .packit.yaml. These steps only work on copr builds, not on official
+# Fedora builds.
+
+set -exo pipefail
+
+#. .packit-rpm-git-commit.sh
+
+# Get Version from HEAD
+VERSION=$(grep '^const RawVersion' version/rawversion/version.go | cut -d\" -f2)
+
+# RPM Version can't take "-"
+RPM_VERSION="${VERSION//-/~}"
+
+# Generate source tarball from HEAD
+#git-archive-all -C $(git rev-parse --show-toplevel) --prefix=$PACKAGE-$VERSION/ rpm/$PACKAGE-$VERSION.tar.gz
+
+# RPM Spec modifications
+
+# Use the Version from HEAD in rpm spec
+sed -i "s/^Version:.*/Version: $RPM_VERSION/" "$SPEC_FILE"
+
+# Use Packit's supplied variable in the Release field in rpm spec.
+sed -i "s/^Release:.*/Release: $PACKIT_RPMSPEC_RELEASE%{?dist}/" "$SPEC_FILE"
+
+# Ensure last part of the release string is the git shortcommit without a
+# prepended "g"
+#sed -i "/^Release: $PACKIT_RPMSPEC_RELEASE%{?dist}/ s/\(.*\)g/\1/" $SPEC_FILE
+
+# Use above generated tarball as Source in rpm spec
+#sed -i "s/^Source0:.*.tar.gz/Source0: $PACKAGE-$VERSION.tar.gz/" $SPEC_FILE
+
+# Update setup macro to use the correct build dir
+sed -i "s/^%autosetup.*/%autosetup -Sgit -n %{name}-$VERSION/" "$SPEC_FILE"

.packit.sh

@@ -5,122 +5,57 @@
 downstream_package_name: podman
 upstream_tag_template: v{version}
 
-packages:
-  podman-fedora:
-    pkg_tool: fedpkg
-    specfile_path: rpm/podman.spec
-  podman-centos:
-    pkg_tool: centpkg
-    specfile_path: rpm/podman.spec
-  podman-eln:
-    specfile_path: rpm/podman.spec
+specfile_path: podman.spec
 
-srpm_build_deps:
-  - git-archive-all
-  - make
+# Disable automatic merging for Copr builds (and subsequent Testing Farm)
+merge_pr_in_ci: false
 
 actions:
-  fix-spec-file:
-    - "bash .packit.sh"
+  fix-spec-file: "bash .packit-copr-rpm.sh"
 
 jobs:
   - job: copr_build
     trigger: pull_request
-    packages: [podman-fedora]
-    notifications: &packit_build_failure_notification
+    notifications: &packit_failure_notification
       failure_comment:
-        message: "Ephemeral COPR build failed. @containers/packit-build please check."
+        message: "Packit jobs failed. @containers/packit-build please check."
     enable_net: true
     targets:
-      - fedora-all-x86_64
-      - fedora-all-aarch64
+      - epel-10-x86_64
+      - epel-10-aarch64
+    actions:
+      post-upstream-clone: "curl --fail -O https://gitlab.com/redhat/centos-stream/rpms/podman/-/raw/c10s/podman.spec"
 
   - job: copr_build
     trigger: pull_request
-    packages: [podman-eln]
-    notifications: *packit_build_failure_notification
+    notifications: *packit_failure_notification
     enable_net: true
     targets:
-      fedora-eln-x86_64:
-        additional_repos:
-          - "https://kojipkgs.fedoraproject.org/repos/eln-build/latest/x86_64/"
-      fedora-eln-aarch64:
-        additional_repos:
-          - "https://kojipkgs.fedoraproject.org/repos/eln-build/latest/aarch64/"
+      - epel-9-x86_64
+      - epel-9-aarch64
+    actions:
+      post-upstream-clone: "curl --fail -O https://gitlab.com/redhat/centos-stream/rpms/podman/-/raw/c9s/podman.spec"
 
-  - job: copr_build
+  - job: tests
     trigger: pull_request
-    packages: [podman-centos]
-    notifications: *packit_build_failure_notification
-    enable_net: true
-    targets:
-      - centos-stream-9-x86_64
-      - centos-stream-9-aarch64
-      - centos-stream-10-x86_64
-      - centos-stream-10-aarch64
-
-  # Run on commit to main branch
-  - job: copr_build
-    trigger: commit
-    packages: [podman-fedora]
-    notifications:
-      failure_comment:
-        message: "podman-next COPR build failed. @containers/packit-build please check."
-    branch: main
-    owner: rhcontainerbot
-    project: podman-next
-    enable_net: true
+    use_internal_tf: true
+    notifications: *packit_failure_notification
+    targets: &packit_test_targets
+      epel-10-x86_64:
+        distros: [RHEL-10-Nightly,RHEL-10.0-Nightly]
+      epel-10-aarch64:
+        distros: [RHEL-10-Nightly,RHEL-10.0-Nightly]
+      epel-9-x86_64:
+        distros: [RHEL-9-Nightly,RHEL-9.6.0-Nightly]
+      epel-9-aarch64:
+        distros: [RHEL-9-Nightly,RHEL-9.6.0-Nightly]
+    tmt_plan: "/plans/system"
+    identifier: "system"
 
   - job: tests
-    identifier: cockpit-revdeps
     trigger: pull_request
-    packages: [podman-fedora]
-    notifications:
-      failure_comment:
-        message: "Cockpit tests failed for commit {commit_sha}. @martinpitt, @jelly, @mvollmer please check."
-    targets:
-      - fedora-latest-stable
-      - fedora-development
-    tf_extra_params:
-      environments:
-        - artifacts:
-          - type: repository-file
-            id: https://copr.fedorainfracloud.org/coprs/g/cockpit/main-builds/repo/fedora-$releasever/group_cockpit-main-builds-fedora-$releasever.repo
-          - type: repository-file
-            id: https://copr.fedorainfracloud.org/coprs/rhcontainerbot/podman-next/repo/fedora-$releasever/rhcontainerbot-podman-next-fedora-$releasever.repo
-          tmt:
-            context:
-              revdeps: "yes"
-
-  - job: propose_downstream
-    trigger: release
-    update_release: false
-    packages: [podman-fedora]
-    dist_git_branches: &fedora_targets
-      - fedora-all
-
-  - job: propose_downstream
-    trigger: release
-    update_release: false
-    packages: [podman-centos]
-    dist_git_branches:
-      - c10s
-
-  - job: koji_build
-    trigger: commit
-    packages: [podman-fedora]
-    sidetag_group: podman-releases
-    dist_git_branches: *fedora_targets
-
-  - job: bodhi_update
-    trigger: koji_build
-    packages: [podman-fedora]
-    sidetag_group: podman-releases
-    # Dependencies are not rpm dependencies, but packages that should go in the
-    # same bodhi update
-    # Ref: https://packit.dev/docs/fedora-releases-guide/releasing-multiple-packages
-    dependencies:
-      - buildah
-      - containers-common
-      - skopeo
-    dist_git_branches: *fedora_targets
+    use_internal_tf: true
+    notifications: *packit_failure_notification
+    targets: *packit_test_targets
+    tmt_plan: "/plans/e2e"
+    identifier: "e2e"

.packit.yaml

@@ -0,0 +1,40 @@
+discover:
+    how: fmf
+
+execute:
+    how: tmt
+
+prepare:
+    - how: shell
+      script: modprobe null_blk nr_devices=1
+      order: 5
+
+provision:
+    how: artemis
+    hardware:
+        memory: ">= 16 GB"
+        cpu:
+            cores: ">= 4"
+            threads: ">=8"
+        disk:
+            - size: ">= 512 GB"
+
+/local-root:
+    summary: Local rootful tests
+    discover+:
+        filter: 'tag:local & tag:root & tag:e2e'
+
+/local-rootless:
+    summary: Local rootless tests
+    discover+:
+        filter: 'tag:local & tag:rootless & tag:e2e'
+
+/remote-root:
+    summary: Remote rootful tests
+    discover+:
+        filter: 'tag:remote & tag:root & tag:e2e'
+
+/remote-rootless:
+    summary: Remote rootless tests
+    discover+:
+        filter: 'tag:remote & tag:rootless & tag:e2e'

plans/cockpit-podman.fmf

@@ -0,0 +1,47 @@
+discover:
+    how: fmf
+
+execute:
+    how: tmt
+
+prepare:
+    - how: shell
+      script: modprobe null_blk nr_devices=1
+      order: 5
+    - how: shell
+      script: |
+        BATS_VERSION=1.12.0
+        curl -L https://github.com/bats-core/bats-core/archive/refs/tags/v"$BATS_VERSION".tar.gz | tar -xz
+        cd bats-core-"$BATS_VERSION"
+        ./install.sh /usr
+      order: 10
+
+provision:
+    how: artemis
+    hardware:
+        memory: ">= 16 GB"
+        cpu:
+            cores: ">= 4"
+            threads: ">=8"
+        disk:
+            - size: ">= 512 GB"
+
+/local-root:
+    summary: Local rootful tests
+    discover+:
+        filter: 'tag:local & tag:root & tag:system'
+
+/local-rootless:
+    summary: Local rootless tests
+    discover+:
+        filter: 'tag:local & tag:rootless & tag:system'
+
+/remote-root:
+    summary: Remote rootful tests
+    discover+:
+        filter: 'tag:remote & tag:root & tag:system'
+
+/remote-rootless:
+    summary: Remote rootless tests
+    discover+:
+        filter: 'tag:remote & tag:rootless & tag:system'