Skip to content

Commit 82e4487

Browse files
Merge pull request #1115 from vojtechtrefny/master_packit-rhel10-branch
Sync rhel10-branch CI configuration to master
2 parents 1801165 + 156195e commit 82e4487

File tree

3 files changed

+57
-13
lines changed

3 files changed

+57
-13
lines changed

.packit.yaml

Lines changed: 28 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -13,18 +13,26 @@ actions:
1313

1414
jobs:
1515
- job: copr_build
16-
metadata:
17-
targets:
18-
- fedora-rawhide-aarch64
19-
- fedora-rawhide-ppc64le
20-
- fedora-rawhide-x86_64
21-
- fedora-latest-aarch64
22-
- fedora-latest-ppc64le
23-
- fedora-latest-x86_64
24-
- fedora-latest-stable-aarch64
25-
- fedora-latest-stable-ppc64le
26-
- fedora-latest-stable-x86_64
16+
targets:
17+
- fedora-rawhide-aarch64
18+
- fedora-rawhide-ppc64le
19+
- fedora-rawhide-x86_64
20+
- fedora-latest-aarch64
21+
- fedora-latest-ppc64le
22+
- fedora-latest-x86_64
23+
- fedora-latest-stable-aarch64
24+
- fedora-latest-stable-ppc64le
25+
- fedora-latest-stable-x86_64
2726
trigger: pull_request
27+
branch: master
28+
29+
- job: copr_build
30+
targets:
31+
- centos-stream-10-aarch64
32+
- centos-stream-10-ppc64le
33+
- centos-stream-10-x86_64
34+
trigger: pull_request
35+
branch: rhel10-branch
2836

2937
- job: copr_build
3038
trigger: commit
@@ -89,6 +97,13 @@ jobs:
8997
trigger: pull_request
9098
targets:
9199
- fedora-latest-stable
100+
branch: master
101+
102+
- job: tests
103+
trigger: pull_request
104+
targets:
105+
- centos-stream-10-x86_64
106+
branch: rhel10-branch
92107

93108
# run tests for libblockdev consumers, see plans/ with `revdeps_blivet == yes`
94109
- job: tests
@@ -99,6 +114,7 @@ jobs:
99114
message: "Blivet tests failed for commit {commit_sha}. @vojtechtrefny please check."
100115
targets:
101116
- fedora-latest-stable
117+
branch: master
102118
tf_extra_params:
103119
environments:
104120
- artifacts:
@@ -116,6 +132,7 @@ jobs:
116132
message: "udisks tests failed for commit {commit_sha}. @vojtechtrefny @tbzatek please check."
117133
targets:
118134
- fedora-latest-stable
135+
branch: master
119136
tf_extra_params:
120137
environments:
121138
- artifacts:

plans/tests-rhel.fmf

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
summary: Run tests
2+
3+
adjust+:
4+
- when: revdeps_blivet == yes or revdeps_udisks == yes
5+
enabled: false
6+
- when: distro == fedora
7+
enabled: false
8+
9+
prepare:
10+
- name: copr
11+
how: shell
12+
script:
13+
- sudo dnf install -y python3-libdnf5 'dnf-command(copr)'
14+
- sudo dnf copr enable -y @storage/udisks-daily centos-stream-10-x86_64
15+
# TF prioritizes Fedora tag repo over all others, in particular our daily COPR
16+
- for f in $(grep -l -r 'testing-farm-tag-repository' /etc/yum.repos.d); do sed -i '/priority/d' "$f" ;done
17+
- sudo dnf -y update
18+
19+
- name: ansible
20+
how: ansible
21+
playbook: misc/install-test-dependencies.yml
22+
23+
execute:
24+
how: tmt
25+
script: ./autogen.sh && ./configure && make -j && sudo make ci

plans/tests.fmf

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
11
summary: Run tests
22

33
adjust+:
4-
when: revdeps_blivet == yes or revdeps_udisks == yes
5-
enabled: false
4+
- when: revdeps_blivet == yes or revdeps_udisks == yes
5+
enabled: false
6+
- when: distro == centos
7+
enabled: false
68

79
prepare:
810
- name: copr

0 commit comments

Comments
 (0)