Skip to content

Commit a267e14

Browse files
committed
Move RHEL branch to TMT
Signed-off-by: Lokesh Mandvekar <[email protected]>
1 parent 9ece6d4 commit a267e14

File tree

2 files changed

+34
-140
lines changed

2 files changed

+34
-140
lines changed

.packit.yaml

Lines changed: 28 additions & 126 deletions
Original file line numberDiff line numberDiff line change
@@ -5,145 +5,47 @@
55
downstream_package_name: buildah
66
upstream_tag_template: v{version}
77

8-
# These files get synced from upstream to downstream (Fedora / CentOS Stream) on every
9-
# propose-downstream job. This is done so tests maintained upstream can be run
10-
# downstream in Zuul CI and Bodhi.
11-
# Ref: https://packit.dev/docs/configuration#files_to_sync
12-
files_to_sync:
13-
- src: rpm/gating.yaml
14-
dest: gating.yaml
15-
delete: true
16-
- src: plans/
17-
dest: plans/
18-
delete: true
19-
mkpath: true
20-
- src: tests/tmt/
21-
dest: tests/tmt/
22-
delete: true
23-
mkpath: true
24-
- src: .fmf/
25-
dest: .fmf/
26-
delete: true
27-
- .packit.yaml
8+
specfile_path: buildah.spec
289

29-
packages:
30-
buildah-fedora:
31-
pkg_tool: fedpkg
32-
specfile_path: rpm/buildah.spec
33-
buildah-centos:
34-
pkg_tool: centpkg
35-
specfile_path: rpm/buildah.spec
36-
buildah-eln:
37-
specfile_path: rpm/buildah.spec
38-
39-
srpm_build_deps:
40-
- make
10+
# Disable automatic merging for Copr builds (and subsequent Testing Farm)
11+
merge_pr_in_ci: false
4112

4213
jobs:
4314
- job: copr_build
4415
trigger: pull_request
45-
packages: [buildah-fedora]
46-
notifications: &copr_build_failure_notification
16+
notifications: &packit_build_failure_notification
4717
failure_comment:
4818
message: "Ephemeral COPR build failed. @containers/packit-build please check."
49-
# Fedora aliases documentation: https://packit.dev/docs/configuration#aliases
50-
# python3-fedora-distro-aliases provides `resolve-fedora-aliases` command
51-
targets: &fedora_copr_targets
52-
- fedora-all-x86_64
53-
- fedora-all-aarch64
5419
enable_net: true
55-
# Disable osh diff scan until Go support is available
56-
# Ref: https://github.com/openscanhub/known-false-positives/pull/30#issuecomment-2858698495
57-
osh_diff_scan_after_copr_build: false
58-
59-
# Ignore until golang is updated in distro buildroot to 1.23.3+
60-
- job: copr_build
61-
trigger: ignore
62-
packages: [buildah-eln]
63-
notifications: *copr_build_failure_notification
6420
targets:
65-
fedora-eln-x86_64:
66-
additional_repos:
67-
- "https://kojipkgs.fedoraproject.org/repos/eln-build/latest/x86_64/"
68-
fedora-eln-aarch64:
69-
additional_repos:
70-
- "https://kojipkgs.fedoraproject.org/repos/eln-build/latest/aarch64/"
71-
enable_net: true
72-
73-
# Ignore until golang is updated in distro buildroot to 1.23.3+
74-
- job: copr_build
75-
trigger: ignore
76-
packages: [buildah-centos]
77-
notifications: *copr_build_failure_notification
78-
targets: &centos_copr_targets
79-
- centos-stream-9-x86_64
80-
- centos-stream-9-aarch64
81-
- centos-stream-10-x86_64
82-
- centos-stream-10-aarch64
83-
enable_net: true
21+
- epel-10-x86_64
22+
- epel-10-aarch64
23+
actions:
24+
post-upstream-clone: "curl -O https://gitlab.com/redhat/centos-stream/rpms/buildah/-/raw/c10s/buildah.spec"
8425

85-
# Run on commit to main branch
8626
- job: copr_build
87-
trigger: commit
88-
packages: [buildah-fedora]
89-
notifications:
90-
failure_comment:
91-
message: "podman-next COPR build failed. @containers/packit-build please check."
92-
branch: main
93-
owner: rhcontainerbot
94-
project: podman-next
95-
enable_net: true
96-
97-
# Tests on Fedora for main branch PRs
98-
- job: tests
9927
trigger: pull_request
100-
packages: [buildah-fedora]
28+
notifications: *packit_build_failure_notification
29+
enable_net: true
10130
targets:
102-
- fedora-all-x86_64
103-
tf_extra_params:
104-
environments:
105-
- artifacts:
106-
- type: repository-file
107-
id: https://copr.fedorainfracloud.org/coprs/rhcontainerbot/podman-next/repo/fedora-$releasever/rhcontainerbot-podman-next-fedora-$releasever.repo
31+
- epel-9-x86_64
32+
- epel-9-aarch64
33+
actions:
34+
post-upstream-clone: "curl -O https://gitlab.com/redhat/centos-stream/rpms/buildah/-/raw/c9s/buildah.spec"
10835

109-
# Ignore until golang is updated in distro buildroot to 1.23.3+
110-
# Tests on CentOS Stream for main branch PRs
36+
# Tests for RHEL
11137
- job: tests
112-
trigger: ignore
113-
packages: [buildah-centos]
38+
trigger: pull_request
39+
use_internal_tf: true
40+
notifications:
41+
failure_comment:
42+
message: "Tests failed. @containers/packit-build please check."
11443
targets:
115-
- centos-stream-9-x86_64
116-
- centos-stream-10-x86_64
117-
tf_extra_params:
118-
environments:
119-
- artifacts:
120-
- type: repository-file
121-
id: https://copr.fedorainfracloud.org/coprs/rhcontainerbot/podman-next/repo/centos-stream-$releasever/rhcontainerbot-podman-next-centos-stream-$releasever.repo
122-
123-
# Sync to Fedora
124-
- job: propose_downstream
125-
trigger: release
126-
packages: [buildah-fedora]
127-
update_release: false
128-
dist_git_branches: &fedora_targets
129-
- fedora-all
130-
131-
# Sync to CentOS Stream
132-
- job: propose_downstream
133-
trigger: release
134-
packages: [buildah-centos]
135-
update_release: false
136-
dist_git_branches:
137-
- c10s
138-
139-
# Fedora Koji build
140-
- job: koji_build
141-
trigger: commit
142-
packages: [buildah-fedora]
143-
sidetag_group: podman-releases
144-
# Dependents are not rpm dependencies, but the package whose bodhi update
145-
# should include this package.
146-
# Ref: https://packit.dev/docs/fedora-releases-guide/releasing-multiple-packages
147-
dependents:
148-
- podman
149-
dist_git_branches: *fedora_targets
44+
epel-10-x86_64:
45+
distros: [RHEL-10-Nightly,RHEL-10.0-Nightly]
46+
epel-10-aarch64:
47+
distros: [RHEL-10-Nightly,RHEL-10.0-Nightly]
48+
epel-9-x86_64:
49+
distros: [RHEL-9-Nightly,RHEL-9.6.0-Nightly]
50+
epel-9-aarch64:
51+
distros: [RHEL-9-Nightly,RHEL-9.6.0-Nightly]

plans/main.fmf

Lines changed: 6 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -5,21 +5,13 @@ execute:
55
how: tmt
66

77
prepare:
8-
- when: distro == centos-stream or distro == rhel
9-
how: shell
8+
- how: shell
109
script: |
11-
dnf -y install https://dl.fedoraproject.org/pub/epel/epel-release-latest-$(rpm --eval '%{?rhel}').noarch.rpm
12-
dnf -y config-manager --set-enabled epel
13-
order: 10
14-
- when: initiator == packit
15-
how: shell
16-
script: |
17-
COPR_REPO_FILE="/etc/yum.repos.d/*podman-next*.repo"
18-
if compgen -G $COPR_REPO_FILE > /dev/null; then
19-
sed -i -n '/^priority=/!p;$apriority=1' $COPR_REPO_FILE
20-
fi
21-
dnf -y upgrade --allowerasing
22-
order: 20
10+
BATS_VERSION=1.12.0
11+
curl -L https://github.com/bats-core/bats-core/archive/refs/tags/v"$BATS_VERSION".tar.gz | tar -xz
12+
cd bats-core-"$BATS_VERSION"
13+
./install.sh /usr
14+
order: 10
2315

2416
provision:
2517
how: artemis

0 commit comments

Comments
 (0)