Skip to content
Open
Show file tree
Hide file tree
Changes from 4 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 24 additions & 3 deletions data/distrodefs/rhel-9/imagetypes.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2813,6 +2813,8 @@ image_types:
# XXX: sadly the osbuild options are upper case for "Unit" vs lower above :(
Unit:
ConditionPathExists: "!/usr/libexec/greenboot/greenboot"
# Enable bootupd metadata generation for ostree commits (9.6+ only)
bootupd_gen_metadata: true
enabled_services: &enabled_services_edge
# XXX: shared with 9.2
- "NetworkManager.service"
Expand All @@ -2822,6 +2824,8 @@ image_types:
# only on rhel-9.2+ and centos
- "ignition-firstboot-complete.service"
- "coreos-ignition-write-issues.service"
# only on rhel-9.6+
- "bootloader-update.service"
conditions: &conditions_edge_commit_image_config
"rhel-9.1 and below do not have ignition":
when:
Expand All @@ -2833,6 +2837,23 @@ image_types:
- "firewalld.service"
- "sshd.service"
- "fdo-client-linuxapp.service"
"rhel-9.5 and below do not have bootupd bootloader update service":
when:
version_greater_or_equal: "9.2"
version_less_than: "9.6"
shallow_merge:
enabled_services:
- "NetworkManager.service"
- "firewalld.service"
- "sshd.service"
- "fdo-client-linuxapp.service"
- "ignition-firstboot-complete.service"
- "coreos-ignition-write-issues.service"
"rhel-9.5 and below do not have bootupd":
when:
version_less_than: "9.6"
shallow_merge:
bootupd_gen_metadata: false
package_sets:
os:
- &edge_commit_pkgset
Expand Down Expand Up @@ -2915,13 +2936,13 @@ image_types:
exclude:
- "rng-tools"
conditions: &conditions_pkgsets_edge_commit
"greenboot in 9.8 and c9s requires bootupd":
"greenboot in 9.6 and c9s requires bootupd":
# we don't want bootupd in edge commits, but greenboot requires
# it in 9.8 and c9s, so we can only exclude it for older versions
# it in 9.6 and c9s, so we can only exclude it for older versions
# NOTE: this is temporary
# see https://github.com/fedora-iot/greenboot-rs/pull/142
when:
version_less_than: "9.8"
version_less_than: "9.6"
append:
exclude:
- "bootupd"
Expand Down
2 changes: 1 addition & 1 deletion schutzbot/update_github_status.sh
Original file line number Diff line number Diff line change
Expand Up @@ -39,5 +39,5 @@ curl \
-u "${SCHUTZBOT_LOGIN}" \
-X POST \
-H "Accept: application/vnd.github.v3+json" \
"https://api.github.com/repos/osbuild/images/statuses/${CI_COMMIT_SHA}" \
"https://api.github.com/repos/osbuild/image-builder/statuses/${CI_COMMIT_SHA}" \
-d '{"state":"'"${GITHUB_NEW_STATE}"'", "description": "'"${GITHUB_NEW_DESC}"'", "context": "'"${CONTEXT}"'", "target_url": "'"${CI_PIPELINE_URL}"'"}'
Original file line number Diff line number Diff line change
@@ -1 +1 @@
cf02837bb37b6f93e42fca270f08b79740269c76
344ea1e38d9cb4025ad02728aca71024414a8e59
Original file line number Diff line number Diff line change
@@ -1 +1 @@
f25956327f05d885f15e61b3ffc10dde964e486c
2ab2563cb744caa6679a8ffe61e0cdc649c6b06c
Original file line number Diff line number Diff line change
@@ -1 +1 @@
3f13c49d0b5e302d688b279de9600892b3944aa2
dcc43beedc638752bf47d7ad53282fd3f35d0fd2
Original file line number Diff line number Diff line change
@@ -1 +1 @@
bbad018a77074c18b998df7bf9e8c49ee09accba
92855e4f2aff280870fad0f2136a46811aa46690
Original file line number Diff line number Diff line change
@@ -1 +1 @@
ae0d8dcad1d1380f8f05868555bf27c8f7494048
6264747e6366de8afa0c48cd537917f1347fed8f
Original file line number Diff line number Diff line change
@@ -1 +1 @@
de2d11d725ce05820dbdfd9de42c320166e760c2
1da17ff2972b0d75e2633310d693c416e77a3f0e
Original file line number Diff line number Diff line change
@@ -1 +1 @@
f90d367805d0087d4e9de6caae57da52bf8da3d7
043b3f5ccaeb3fe94431d4f91bf2a75b832d7c7c
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0913370edade80ebc8be81333a53a55952a5ed26
be12e8ab51a6c417ee02b33148a12e6d7f319778
Original file line number Diff line number Diff line change
@@ -1 +1 @@
c71fc686fc111093f844ac13f607fd140ba646f9
ed597c7fbdbe7d9686f73618636d4fa7c5f35bff
Original file line number Diff line number Diff line change
@@ -1 +1 @@
3202faeb33c6a6abce65315519de6d15baa4ccdc
cd912d95e86a561315dd6a0f46bba29a68e93294
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0535593fd01a218a1e8f0adb7028761f30f35e10
37f017bb9969f7821edc2eed5fd246494dffd0dd
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0a098fed94aeda2a361b8de5fe670b039b93ca1f
5fcf0167558b9929923ca3cd34dfa092d47fe48a
Original file line number Diff line number Diff line change
@@ -1 +1 @@
e180fe554ca6a1da219c4cdcd3f7fc5312db21d6
25fb633729153e8e80f4bef34a9fe36870589dfd
Original file line number Diff line number Diff line change
@@ -1 +1 @@
064999353642ac414049ecada75a84d5570c75ca
00b32808d532e3f06ecfa62960251163e1a62d3f
Original file line number Diff line number Diff line change
@@ -1 +1 @@
752e5babc164661193a8f44a5c2813e741852848
3f5b328dcc7f091a1e8389929a2bc0b909cf16b3
Original file line number Diff line number Diff line change
@@ -1 +1 @@
adaab627466c5454eff6a634a70ace3a16247558
6e42baa74f0513911eaa554328f4e1c73ca1d3a0
Original file line number Diff line number Diff line change
@@ -1 +1 @@
79a324fbf9dc83da3731136f7930bef7dd034b06
5ee424de6d5cd8a59a5cb65549ee6f123ad92714
Original file line number Diff line number Diff line change
@@ -1 +1 @@
3448355bcf4763f9b2a055bad93a702049bd12b3
7b23c31ebb35c0a5e1eee01d63bcce9fa2c25602
Original file line number Diff line number Diff line change
@@ -1 +1 @@
b475ac50c35c37e78add98e59085b6df550953dc
d350b9383a136fdb53bdf2bc165444ee3e10039f
Original file line number Diff line number Diff line change
@@ -1 +1 @@
797e865ebe377e8af844d3e9e53fb4d2eca2019b
6a96d7d2a8f0de3a6d0e334bf6f723fc0456f00d
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1d5b7d2f57792be9ebebba6aed09099852176937
f7aa0890c928d3e6e81e1bb54631e63eff386a4f
Original file line number Diff line number Diff line change
@@ -1 +1 @@
38fe9fe3df2daf266ed7fbfbe65ec72cf29bf482
70c2a796a466a398f2cd3ee3587e1d3168caddbc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
c669f5bfe4649e3d91450ae5003175805fa959db
cfe1fdb2fa2fcf2499647d5ac6829d58613f4a43
Original file line number Diff line number Diff line change
@@ -1 +1 @@
95aea5639cfee3cc25fd8418fe07878dd498fce8
ab1b9fe02a0f4ed588a5230cf548228111aff237
Original file line number Diff line number Diff line change
@@ -1 +1 @@
b4857abdeecf323bb7cdaf327bd5446d48293136
216738c64ce041ba52895e60be56aa62470bbd00
Original file line number Diff line number Diff line change
@@ -1 +1 @@
61f8c6cc8809b41240d687f943918fccf3bdca75
c4e137ca2bfa6400e73724f3e31ad0854c5391da
Original file line number Diff line number Diff line change
@@ -1 +1 @@
98ff410108d36a582f73dd997ceea061f9c95947
444641a25f1b33146659a7640e2d52b36a2f24e4
Original file line number Diff line number Diff line change
@@ -1 +1 @@
496917cdc68805d79572a291ea99df191c7da876
7a36d2db0a90d27c04ddba2629f5116ee554472d
Original file line number Diff line number Diff line change
@@ -1 +1 @@
7e3e8dce4e93d50497546d334f91fb72b4931618
d691f56f1835e143a16ecef48a1c90fa63d94fe4
Original file line number Diff line number Diff line change
@@ -1 +1 @@
e7a89e0fcfdc4b3e8a4cb0b6e8c6f1d6b53052d3
d30ee2853a75b6a9fd5d725376088445fdc9f400
Original file line number Diff line number Diff line change
@@ -1 +1 @@
16db12c1a6d92a2d62dc5f4cd4ace355dd070a38
774dd55d26e7b77344e5ad4e06858db098a5886a
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2a9ed3eef84654b704e639832d4bdda1d0d316cb
22b5db1654a109f7f0405f93825c96cf8e95b96b
Original file line number Diff line number Diff line change
@@ -1 +1 @@
9498aa0c8dc2f070aef50f0c7e3d519cd84184fa
867726aba330285499bfddcaf81c5f652b5f5952
Original file line number Diff line number Diff line change
@@ -1 +1 @@
60263fc7ce9a8aa0899cef03894ff8247807c629
747a69b43d0d61a9f59d22bd6c8718629820dcf0
Original file line number Diff line number Diff line change
@@ -1 +1 @@
e3e16131f49c28fcd1e76e4ab7f2a33c010c67e6
f464ee4ec45ab9be0dac192b83bedc2b71364339
Original file line number Diff line number Diff line change
@@ -1 +1 @@
ed36fd5a5e73684d0507a4fa18ecdb4d240769a8
7d11b487a87855ddfacc1bdc1004c4f03da20332
Original file line number Diff line number Diff line change
@@ -1 +1 @@
38692b7cb36f0ffcee6ab356a8cdc561ac4dd7a3
cdf3310914a80446fc30648eef685f21442b78a0
Original file line number Diff line number Diff line change
@@ -1 +1 @@
70889ea2d7a304a30f548375f6b394efc8875e39
07282879c18c87e58035b12d266a8a1532d8e1d2
Original file line number Diff line number Diff line change
@@ -1 +1 @@
d0c89e6b056f5675ebe01dc6d453cca69562d69d
bf6afa66e52a09e76981f11aa90c5c758c6b9c83
Original file line number Diff line number Diff line change
@@ -1 +1 @@
9d76cafcbb5ec34ea98f70704cf32ba7bab72e76
a6c3fa0c1214f507f268c8cf4b4758b5a335fafe
Original file line number Diff line number Diff line change
@@ -1 +1 @@
dfc85ef8a34ff732acda92cb84276ef583c94c7b
f7bb3288a0a70f4d78986042f86cac08ebb37fae
Original file line number Diff line number Diff line change
@@ -1 +1 @@
4eebbf64f72d4ebf3309a9b96bb7785a7c21c6d8
85879cec1b980a6161efe053274ae12c84157d58
Original file line number Diff line number Diff line change
@@ -1 +1 @@
f15f36f83613620ecd6cff0439dd759c8e0217ce
aaf06c0ef454cbb1dd37262a071a9f1e2422045c
Original file line number Diff line number Diff line change
@@ -1 +1 @@
81e270f6dc564baa0ad8ac32312994dcae190617
1960c8e905f57e6a7dd2850204d6f846952b5802
Original file line number Diff line number Diff line change
@@ -1 +1 @@
bbd3cb646f50bb9d03c8301d776a90a5942cfa8b
3e90c8f2985b781787a33f9ad055140ee6c777d2
Original file line number Diff line number Diff line change
@@ -1 +1 @@
15cb514d62a15f5f7b964113f56ae94e3a7bae5c
fc190e6795e864982d0f3ea8545473cef8105f2e
Original file line number Diff line number Diff line change
@@ -1 +1 @@
5a424c78492d1bec14bfb74eec4f15a43a649cc3
bdfb5daaa792fd3633c7ac3bd5006c87412080f5
Original file line number Diff line number Diff line change
@@ -1 +1 @@
44d0e79c17025cb712f7b77fd8cf250a7a7abe14
e523c0de15671f8a3dda9da3f6bb0617a591f209
Original file line number Diff line number Diff line change
@@ -1 +1 @@
63463b98887f63128c61bc7fc0c9cf5b93bace43
8e24c8a5b80f89ca0914c80b25b0eaa8a4c2236d
Original file line number Diff line number Diff line change
@@ -1 +1 @@
19738d8890a1855ff2149536c9dd913ae3aa49bc
32db63ac66d473f4e134e368b20215cc4a51adde
Original file line number Diff line number Diff line change
@@ -1 +1 @@
386ab791294a7e7f5f41673d6e7f1801a65d65e6
13e0088eef6e4edf2da77bb1a6c19aa612fc1d31
Original file line number Diff line number Diff line change
@@ -1 +1 @@
670d7c3cf59a19c6430be11e250e58b5e802652b
c340f596d96943e47b42d5036aa9f448e1655531
Original file line number Diff line number Diff line change
@@ -1 +1 @@
172464050f126adce86af3d357a0fa3f698db6fd
698757986749fbad5c6f35292dce3a944ef6de98
Original file line number Diff line number Diff line change
@@ -1 +1 @@
7942c8f6456879b100eeb2ff4fde161877be8b0b
cca415a16a60db63a9826eaf8165feab838204b8
Loading