Skip to content

Commit 6b00ee7

Browse files
Stop treating EPEL 10 specially (#518)
Stop treating EPEL 10 specially Merge after packit/packit#2694. Reviewed-by: gemini-code-assist[bot] Reviewed-by: Maja Massarini
2 parents 71d6a18 + 36e241c commit 6b00ee7

4 files changed

Lines changed: 11 additions & 346 deletions

File tree

.packit.yaml

Lines changed: 11 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -49,22 +49,6 @@ packages:
4949
- python3 setup.py sdist --dist-dir ./epel8/
5050
- bash -c "ls -1t ./epel8/*.tar.gz | head -n 1"
5151

52-
specfile-epel10:
53-
<<: *specfile
54-
specfile_path: &specfile_path_epel10 epel10/python-specfile.spec
55-
files_to_sync:
56-
- *specfile_path_epel10
57-
- .packit.yaml
58-
- src: plans/
59-
dest: plans/
60-
- src: .fmf/
61-
dest: .fmf/
62-
actions:
63-
<<: *actions
64-
create-archive:
65-
- python3 setup.py sdist --dist-dir ./epel10/
66-
- bash -c "ls -1t ./epel10/*.tar.gz | head -n 1"
67-
6852
# docs: https://gitlab.com/CentOS/Integration/packit-cbs/docs
6953
specfile-centos-integration-sig:
7054
<<: *specfile
@@ -95,14 +79,11 @@ jobs:
9579
- fedora-all
9680
- fedora-all-aarch64
9781
- epel-9
82+
- epel-10-all
9883
- <<: *copr_build_pr
9984
packages: [specfile-epel8]
10085
targets:
10186
- epel-8
102-
- <<: *copr_build_pr
103-
packages: [specfile-epel10]
104-
targets:
105-
- epel-10-all
10687

10788
- &copr_build_commit_main
10889
job: copr_build
@@ -113,17 +94,14 @@ jobs:
11394
- fedora-all
11495
- fedora-all-aarch64
11596
- epel-9
97+
- epel-10-all
11698
project: packit-dev
11799
list_on_homepage: True
118100
preserve_project: True
119101
- <<: *copr_build_commit_main
120102
packages: [specfile-epel8]
121103
targets:
122104
- epel-8
123-
- <<: *copr_build_commit_main
124-
packages: [specfile-epel10]
125-
targets:
126-
- epel-10-all
127105

128106
- &copr_build_commit_stable
129107
job: copr_build
@@ -145,17 +123,14 @@ jobs:
145123
- fedora-all
146124
- fedora-all-aarch64
147125
- epel-9
126+
- epel-10-all
148127
project: packit-releases
149128
list_on_homepage: True
150129
preserve_project: True
151130
- <<: *copr_build_release
152131
packages: [specfile-epel8]
153132
targets:
154133
- epel-8
155-
- <<: *copr_build_release
156-
packages: [specfile-epel10]
157-
targets:
158-
- epel-10-all
159134

160135
- &tests
161136
job: tests
@@ -165,6 +140,7 @@ jobs:
165140
targets:
166141
- fedora-all
167142
- epel-9
143+
- epel-10-all
168144
- <<: *tests
169145
identifier: performance
170146
tmt_plan: performance
@@ -186,11 +162,6 @@ jobs:
186162
set -x
187163
dnf -y install https://dl.fedoraproject.org/pub/epel/epel-release-latest-8.noarch.rpm
188164
%end
189-
- <<: *tests
190-
packages: [specfile-epel10]
191-
tmt_plan: "smoke|full"
192-
targets:
193-
- epel-10-all
194165
195166
- &propose_downstream
196167
job: propose_downstream
@@ -202,16 +173,13 @@ jobs:
202173
- fedora-branched
203174
- eln
204175
epel-9: {}
176+
epel-10:
177+
fast_forward_merge_into:
178+
- epel-10-branched
205179
- <<: *propose_downstream
206180
packages: [specfile-epel8]
207181
dist_git_branches:
208182
- epel-8
209-
- <<: *propose_downstream
210-
packages: [specfile-epel10]
211-
dist_git_branches:
212-
epel-10:
213-
fast_forward_merge_into:
214-
- epel-10-branched
215183
- <<: *propose_downstream
216184
packages: [specfile-centos-integration-sig]
217185
dist_git_branches:
@@ -227,16 +195,13 @@ jobs:
227195
- fedora-branched
228196
- eln
229197
epel-9: {}
198+
epel-10:
199+
fast_forward_merge_into:
200+
- epel-10-branched
230201
- <<: *pull_from_upstream
231202
packages: [specfile-epel8]
232203
dist_git_branches:
233204
- epel-8
234-
- <<: *pull_from_upstream
235-
packages: [specfile-epel10]
236-
dist_git_branches:
237-
epel-10:
238-
fast_forward_merge_into:
239-
- epel-10-branched
240205
- <<: *pull_from_upstream
241206
packages: [specfile-centos-integration-sig]
242207
dist_git_branches:
@@ -254,10 +219,6 @@ jobs:
254219
packages: [specfile-epel8]
255220
dist_git_branches:
256221
- epel-8
257-
- <<: *koji_build
258-
packages: [specfile-epel10]
259-
dist_git_branches:
260-
- epel-10-all
261222
- <<: *koji_build
262223
packages: [specfile-centos-integration-sig]
263224
dist_git_branches:
@@ -268,6 +229,7 @@ jobs:
268229
- packit
269230
dist_git_branches:
270231
- fedora-all
232+
- epel-10-all
271233

272234
- &bodhi_update
273235
job: bodhi_update
@@ -281,7 +243,3 @@ jobs:
281243
packages: [specfile-epel8]
282244
dist_git_branches:
283245
- epel-8
284-
- <<: *bodhi_update
285-
packages: [specfile-epel10]
286-
dist_git_branches:
287-
- epel-10-all

0 commit comments

Comments
 (0)