Skip to content

Commit 4204134

Browse files
Build and release for EPEL 10.y (#456)
Build and release for EPEL 10.y Related to packit/packit#2438. Reviewed-by: Maja Massarini
2 parents eab3524 + 4267595 commit 4204134

File tree

6 files changed

+390
-101
lines changed

6 files changed

+390
-101
lines changed

.github/workflows/prepare-release.yml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,11 @@ jobs:
2323
uses: packit/prepare-release@v3
2424
with:
2525
version: ${{ inputs.version }}
26-
specfiles: fedora/python-specfile.spec,epel8/python-specfile.spec
26+
specfiles: >
27+
fedora/python-specfile.spec,
28+
epel8/python-specfile.spec,
29+
epel10/python-specfile.spec,
30+
centos-integration-sig/python-specfile.spec
2731
prerelease_suffix_pattern: "([.\\-_]?)(a(lpha)?|b(eta)?|r?c|pre(view)?)([.\\-_]?\\d+)?"
2832
prerelease_suffix_macro: prerelease
2933
- name: Create Pull Request

.packit.yaml

Lines changed: 121 additions & 98 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ prerelease_suffix_macro: prerelease
1111
copy_upstream_release_description: true
1212

1313
packages:
14-
specfile:
14+
specfile: &specfile
1515
upstream_package_name: specfile
1616
downstream_package_name: python-specfile
1717
specfile_path: &specfile_path fedora/python-specfile.spec
@@ -25,77 +25,87 @@ packages:
2525
srpm_build_deps:
2626
- python3-build
2727
- python3-setuptools_scm
28-
actions:
28+
actions: &actions
2929
pre-sync:
3030
- python3 plans/git_reference.py
3131
create-archive:
3232
- python3 -m build --sdist --outdir ./fedora/
3333
- bash -c "ls -1t ./fedora/*.tar.gz | head -n 1"
3434
get-current-version: python3 -m setuptools_scm
3535

36-
# docs: https://gitlab.com/CentOS/Integration/packit-cbs/docs
37-
specfile-centos-integration-sig:
38-
upstream_package_name: specfile
39-
downstream_package_name: python-specfile
40-
specfile_path: &specfile_path_centos centos-integration-sig/python-specfile.spec
36+
specfile-epel8:
37+
<<: *specfile
38+
specfile_path: &specfile_path_epel8 epel8/python-specfile.spec
4139
files_to_sync:
42-
- *specfile_path_centos
40+
- *specfile_path_epel8
4341
- .packit.yaml
4442
- src: plans/
4543
dest: plans/
4644
- src: .fmf/
4745
dest: .fmf/
48-
srpm_build_deps:
49-
- python3-build
50-
- python3-setuptools_scm
5146
actions:
52-
pre-sync:
53-
- python3 plans/git_reference.py
47+
<<: *actions
5448
create-archive:
55-
- python3 -m build --sdist --outdir ./fedora/
56-
- bash -c "ls -1t ./centos-integration-sig/*.tar.gz | head -n 1"
57-
get-current-version: python3 -m setuptools_scm
58-
dist_git_base_url: https://gitlab.com
59-
dist_git_namespace: CentOS/Integration/packit-cbs/rpms
60-
sig: Integration/packit-cbs
61-
pkg_tool: centpkg-sig
49+
- python3 setup.py sdist --dist-dir ./epel8/
50+
- bash -c "ls -1t ./epel8/*.tar.gz | head -n 1"
6251

63-
specfile-epel8:
64-
upstream_package_name: specfile
65-
downstream_package_name: python-specfile
66-
specfile_path: &specfile_path_epel8 epel8/python-specfile.spec
52+
specfile-epel10:
53+
<<: *specfile
54+
specfile_path: &specfile_path_epel10 epel10/python-specfile.spec
6755
files_to_sync:
68-
- *specfile_path_epel8
56+
- *specfile_path_epel10
6957
- .packit.yaml
7058
- src: plans/
7159
dest: plans/
7260
- src: .fmf/
7361
dest: .fmf/
74-
srpm_build_deps:
75-
- python3-setuptools_scm
7662
actions:
77-
pre-sync:
78-
- python3 plans/git_reference.py
63+
<<: *actions
7964
create-archive:
80-
- python3 setup.py sdist --dist-dir ./epel8/
81-
- bash -c "ls -1t ./epel8/*.tar.gz | head -n 1"
82-
get-current-version: python3 setup.py --version
65+
- python3 setup.py sdist --dist-dir ./epel10/
66+
- bash -c "ls -1t ./epel10/*.tar.gz | head -n 1"
67+
68+
# docs: https://gitlab.com/CentOS/Integration/packit-cbs/docs
69+
specfile-centos-integration-sig:
70+
<<: *specfile
71+
specfile_path: &specfile_path_centos_sig centos-integration-sig/python-specfile.spec
72+
files_to_sync:
73+
- *specfile_path_centos_sig
74+
- .packit.yaml
75+
- src: plans/
76+
dest: plans/
77+
- src: .fmf/
78+
dest: .fmf/
79+
actions:
80+
<<: *actions
81+
create-archive:
82+
- python3 -m build --sdist --outdir ./centos-integration-sig/
83+
- bash -c "ls -1t ./centos-integration-sig/*.tar.gz | head -n 1"
84+
dist_git_base_url: https://gitlab.com
85+
dist_git_namespace: CentOS/Integration/packit-cbs/rpms
86+
sig: Integration/packit-cbs
87+
pkg_tool: centpkg-sig
8388

8489
jobs:
85-
- job: copr_build
90+
- &copr_build_pr
91+
job: copr_build
8692
trigger: pull_request
8793
packages: [specfile]
8894
targets:
8995
- fedora-all
9096
- fedora-all-aarch64
9197
- epel-9
92-
- job: copr_build
93-
trigger: pull_request
98+
- <<: *copr_build_pr
9499
packages: [specfile-epel8]
95100
targets:
96101
- epel-8
102+
- <<: *copr_build_pr
103+
packages: [specfile-epel10]
104+
targets:
105+
- epel-10-all
97106

98-
- job: copr_build
107+
- &copr_build_commit_main
108+
job: copr_build
99109
trigger: commit
100110
branch: main
101111
packages: [specfile]
@@ -106,38 +116,29 @@ jobs:
106116
project: packit-dev
107117
list_on_homepage: True
108118
preserve_project: True
109-
- job: copr_build
110-
trigger: commit
111-
branch: main
119+
- <<: *copr_build_commit_main
112120
packages: [specfile-epel8]
113121
targets:
114122
- epel-8
115-
project: packit-dev
116-
list_on_homepage: True
117-
preserve_project: True
123+
- <<: *copr_build_commit_main
124+
packages: [specfile-epel10]
125+
targets:
126+
- epel-10-all
118127

119-
- job: copr_build
128+
- &copr_build_commit_stable
129+
job: copr_build
120130
trigger: commit
121131
branch: stable
122132
packages: [specfile]
123133
targets:
124-
- fedora-stable
125-
- fedora-stable-aarch64
126-
- epel-9
127-
project: packit-stable
128-
list_on_homepage: True
129-
preserve_project: True
130-
- job: copr_build
131-
trigger: commit
132-
branch: stable
133-
packages: [specfile-epel8]
134-
targets:
135-
- epel-8
134+
- fedora-latest-stable
135+
- fedora-latest-stable-aarch64
136136
project: packit-stable
137137
list_on_homepage: True
138138
preserve_project: True
139139

140-
- job: copr_build
140+
- &copr_build_release
141+
job: copr_build
141142
trigger: release
142143
packages: [specfile]
143144
targets:
@@ -147,30 +148,35 @@ jobs:
147148
project: packit-releases
148149
list_on_homepage: True
149150
preserve_project: True
150-
- job: copr_build
151-
trigger: release
151+
- <<: *copr_build_release
152152
packages: [specfile-epel8]
153153
targets:
154154
- epel-8
155-
project: packit-releases
156-
list_on_homepage: True
157-
preserve_project: True
155+
- <<: *copr_build_release
156+
packages: [specfile-epel10]
157+
targets:
158+
- epel-10-all
158159

159-
- job: tests
160+
- &tests
161+
job: tests
160162
trigger: pull_request
161163
packages: [specfile]
162164
tmt_plan: "smoke|full|packit-integration"
163165
targets:
164166
- fedora-all
165167
- epel-9
166-
- job: tests
167-
trigger: pull_request
168+
- <<: *tests
169+
identifier: performance
170+
tmt_plan: performance
171+
targets:
172+
- fedora-rawhide
173+
- <<: *tests
168174
packages: [specfile-epel8]
169175
tmt_plan: "smoke|full"
170176
use_internal_tf: true
171177
targets:
172-
epel-8:
173-
distros: [RHEL-8]
178+
epel-8-x86_64:
179+
distros: [RHEL-8.10.0-Nightly]
174180
# enable EPEL
175181
tf_extra_params:
176182
environments:
@@ -180,83 +186,100 @@ jobs:
180186
set -x
181187
dnf -y install https://dl.fedoraproject.org/pub/epel/epel-release-latest-8.noarch.rpm
182188
%end
183-
184-
- job: tests
185-
trigger: pull_request
186-
packages: [specfile]
187-
identifier: performance
188-
tmt_plan: performance
189+
- <<: *tests
190+
packages: [specfile-epel10]
191+
tmt_plan: "smoke|full"
189192
targets:
190-
- fedora-rawhide
193+
- epel-10-all
191194

192-
- job: propose_downstream
195+
- &propose_downstream
196+
job: propose_downstream
193197
trigger: release
194198
packages: [specfile]
195199
dist_git_branches:
196200
rawhide:
197201
fast_forward_merge_into:
198202
- fedora-branched
199203
epel-9: {}
200-
- job: propose_downstream
201-
trigger: release
204+
- <<: *propose_downstream
202205
packages: [specfile-epel8]
203206
dist_git_branches:
204207
- epel-8
205-
- job: propose_downstream
206-
trigger: release
208+
- <<: *propose_downstream
209+
packages: [specfile-epel10]
210+
dist_git_branches:
211+
epel-10:
212+
fast_forward_merge_into:
213+
- epel-10-branched
214+
- <<: *propose_downstream
207215
packages: [specfile-centos-integration-sig]
208216
dist_git_branches:
209217
- c9-sig-integration
210218

211-
- job: pull_from_upstream
219+
- &pull_from_upstream
220+
job: pull_from_upstream
212221
trigger: release
213222
packages: [specfile]
214223
dist_git_branches:
215224
rawhide:
216225
fast_forward_merge_into:
217226
- fedora-branched
218227
epel-9: {}
219-
- job: pull_from_upstream
220-
trigger: release
228+
- <<: *pull_from_upstream
221229
packages: [specfile-epel8]
222230
dist_git_branches:
223231
- epel-8
224-
- job: pull_from_upstream
225-
trigger: release
232+
- <<: *pull_from_upstream
233+
packages: [specfile-epel10]
234+
dist_git_branches:
235+
epel-10:
236+
fast_forward_merge_into:
237+
- epel-10-branched
238+
- <<: *pull_from_upstream
226239
packages: [specfile-centos-integration-sig]
227240
dist_git_branches:
228241
- c9-sig-integration
229242

230-
- job: koji_build
243+
- &koji_build
244+
job: koji_build
231245
trigger: commit
232246
packages: [specfile]
233247
packit_instances: ["stg"]
234248
allowed_pr_authors: ["packit-stg", "packit"]
235-
sidetag_group: packit-specfile-ogr-releases
236-
dependents:
237-
- packit
238249
dist_git_branches:
239-
- fedora-all
240250
- epel-9
241-
- job: koji_build
242-
trigger: commit
251+
- <<: *koji_build
243252
packages: [specfile-epel8]
244-
packit_instances: ["stg"]
245-
allowed_pr_authors: ["packit-stg", "packit"]
246253
dist_git_branches:
247254
- epel-8
248-
- job: koji_build
249-
trigger: commit
255+
- <<: *koji_build
256+
packages: [specfile-epel10]
257+
dist_git_branches:
258+
- epel-10-all
259+
- <<: *koji_build
250260
packages: [specfile-centos-integration-sig]
251-
packit_instances: ["stg"]
252-
allowed_pr_authors: ["packit-stg", "packit"]
253261
dist_git_branches:
254262
- c9-sig-integration
263+
- <<: *koji_build
264+
sidetag_group: packit-specfile-ogr-releases
265+
dependents:
266+
- packit
267+
dist_git_branches:
268+
- fedora-all
255269

256-
- job: bodhi_update
270+
- &bodhi_update
271+
job: bodhi_update
257272
trigger: commit
258-
packages: [specfile-epel8]
273+
packages: [specfile]
259274
packit_instances: ["stg"]
260275
allowed_builders: ["packit-stg", "packit"]
276+
dist_git_branches:
277+
- epel-9
278+
- <<: *bodhi_update
279+
packages: [specfile-epel8]
261280
dist_git_branches:
262281
- epel-8
282+
- <<: *bodhi_update
283+
packages: [specfile-epel10]
284+
dist_git_branches:
285+
- epel-10-all

0 commit comments

Comments
 (0)