Skip to content

Commit ddca779

Browse files
committed
Move RHEL branch to TMT
Advantages: - Test RHEL branches on on actual RHEL - Reduce our GCE/AWS usage - Easier to switch git host (RE: CNCF) Note: This setup does not do rpm builds, binaries are built from source itself using Makefile. There's no clean and reliable way to fetch actual RHEL spec files using packit, and CentOS Stream spec files can't be depended on as they move at a faster pace and can be out of sync with RHEL release spec files. Fixes: RUN-3105 Signed-off-by: Lokesh Mandvekar <[email protected]>
1 parent ad4d8b3 commit ddca779

File tree

8 files changed

+91
-293
lines changed

8 files changed

+91
-293
lines changed

.fmf/version

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
1

.packit.yaml

Lines changed: 9 additions & 87 deletions
Original file line numberDiff line numberDiff line change
@@ -2,94 +2,16 @@
22
# See the documentation for more information:
33
# https://packit.dev/docs/configuration/
44

5-
downstream_package_name: buildah
6-
upstream_tag_template: v{version}
7-
8-
packages:
9-
buildah-fedora:
10-
pkg_tool: fedpkg
11-
specfile_path: rpm/buildah.spec
12-
buildah-centos:
13-
pkg_tool: centpkg
14-
specfile_path: rpm/buildah.spec
15-
buildah-eln:
16-
specfile_path: rpm/buildah.spec
17-
18-
srpm_build_deps:
19-
- make
20-
215
jobs:
22-
- job: copr_build
6+
- job: tests
237
trigger: pull_request
24-
packages: [buildah-fedora]
25-
notifications: &copr_build_failure_notification
8+
skip_build: true
9+
use_internal_tf: true
10+
notifications: &packit_failure_notification
2611
failure_comment:
27-
message: "Ephemeral COPR build failed. @containers/packit-build please check."
28-
targets:
29-
- fedora-all-x86_64
30-
- fedora-all-aarch64
31-
enable_net: true
32-
33-
- job: copr_build
34-
trigger: pull_request
35-
packages: [buildah-eln]
36-
notifications: *copr_build_failure_notification
37-
targets:
38-
fedora-eln-x86_64:
39-
additional_repos:
40-
- "https://kojipkgs.fedoraproject.org/repos/eln-build/latest/x86_64/"
41-
fedora-eln-aarch64:
42-
additional_repos:
43-
- "https://kojipkgs.fedoraproject.org/repos/eln-build/latest/aarch64/"
44-
enable_net: true
45-
46-
- job: copr_build
47-
trigger: pull_request
48-
packages: [buildah-centos]
49-
notifications: *copr_build_failure_notification
12+
message: "Packit jobs failed. @containers/packit-build please check."
5013
targets:
51-
- centos-stream-9-x86_64
52-
- centos-stream-9-aarch64
53-
- centos-stream-10-x86_64
54-
- centos-stream-10-aarch64
55-
enable_net: true
56-
57-
# Run on commit to main branch
58-
- job: copr_build
59-
trigger: commit
60-
packages: [buildah-fedora]
61-
notifications:
62-
failure_comment:
63-
message: "podman-next COPR build failed. @containers/packit-build please check."
64-
branch: main
65-
owner: rhcontainerbot
66-
project: podman-next
67-
enable_net: true
68-
69-
# Sync to Fedora
70-
- job: propose_downstream
71-
trigger: release
72-
packages: [buildah-fedora]
73-
update_release: false
74-
dist_git_branches: &fedora_targets
75-
- fedora-all
76-
77-
# Sync to CentOS Stream
78-
- job: propose_downstream
79-
trigger: release
80-
packages: [buildah-centos]
81-
update_release: false
82-
dist_git_branches:
83-
- c10s
84-
85-
# Fedora Koji build
86-
- job: koji_build
87-
trigger: commit
88-
packages: [buildah-fedora]
89-
sidetag_group: podman-releases
90-
# Dependents are not rpm dependencies, but the package whose bodhi update
91-
# should include this package.
92-
# Ref: https://packit.dev/docs/fedora-releases-guide/releasing-multiple-packages
93-
dependents:
94-
- podman
95-
dist_git_branches: *fedora_targets
14+
epel-10-x86_64:
15+
distros: [RHEL-10.0-Nightly]
16+
epel-9-x86_64:
17+
distros: [RHEL-9.6.0-Nightly]
-13 Bytes
Binary file not shown.

plans/main.fmf

Lines changed: 58 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,58 @@
1+
prepare:
2+
- name: dependencies
3+
how: install
4+
package: [ bzip2, git-daemon, glibc-static, golang, go-md2man, gpgme-devel, libseccomp-devel, podman-docker, slirp4netns, wget ]
5+
order: 5
6+
- how: shell
7+
script: |
8+
# Install bats
9+
# https://bats-core.readthedocs.io/en/stable/installation.html
10+
BATS_VERSION=1.12.0
11+
curl --fail -L https://github.com/bats-core/bats-core/archive/refs/tags/v"$BATS_VERSION".tar.gz | tar -xz
12+
pushd bats-core-"$BATS_VERSION"
13+
./install.sh /usr
14+
popd
15+
# Install parallel
16+
# https://cgit.git.savannah.gnu.org/cgit/parallel.git/tree/README
17+
wget https://ftpmirror.gnu.org/parallel/parallel-20250522.tar.bz2
18+
bzip2 -dc parallel-20250522.tar.bz2 | tar xvf -
19+
pushd parallel-20250522
20+
./configure && make && make install
21+
popd
22+
order: 10
23+
24+
discover:
25+
how: fmf
26+
27+
execute:
28+
how: tmt
29+
30+
/integration:
31+
summary: integration test
32+
discover+:
33+
filter: 'tag:integration'
34+
35+
/lint:
36+
summary: lint test
37+
discover+:
38+
filter: 'tag:lint'
39+
40+
/unit:
41+
summary: unit test
42+
discover+:
43+
filter: 'tag:unit'
44+
45+
/vendor:
46+
summary: vendor test
47+
discover+:
48+
filter: 'tag:vendor'
49+
50+
provision:
51+
how: artemis
52+
hardware:
53+
memory: ">= 16 GB"
54+
cpu:
55+
cores: ">= 4"
56+
threads: ">=8"
57+
disk:
58+
- size: ">= 512 GB"

rpm/Makefile

Lines changed: 0 additions & 12 deletions
This file was deleted.

rpm/buildah.spec

Lines changed: 0 additions & 174 deletions
This file was deleted.

rpm/update-spec-version.sh

Lines changed: 0 additions & 20 deletions
This file was deleted.

tests/tmt/main.fmf

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
/integration:
2+
tag: [ integration ]
3+
summary: integration test
4+
test: cd $TMT_TREE && make && make test-integration
5+
duration: 30m
6+
7+
/lint:
8+
tag: [ lint ]
9+
summary: lint test
10+
test: make -C $TMT_TREE lint
11+
duration: 30m
12+
13+
/unit:
14+
tag: [ unit ]
15+
summary: unit test
16+
test: make -C $TMT_TREE test-unit
17+
duration: 30m
18+
19+
/vendor:
20+
tag: [ vendor ]
21+
summary: vendor test
22+
test: make -C $TMT_TREE vendor
23+
duration: 30m

0 commit comments

Comments
 (0)