Skip to content

Commit a876a9b

Browse files
dustymabedustymabe
committed
osbuild: drop support for building disk images from OSTree commit
Now that we are building only F42+ images we are never passing in an OSTree commit. The FCOS pipeline was the only consumer of this so we can safely drop that conditional logic.
1 parent 2901597 commit a876a9b

File tree

5 files changed

+159
-278
lines changed

5 files changed

+159
-278
lines changed

‎src/osbuild-manifests/coreos.osbuild.aarch64.mpp.yaml

Lines changed: 32 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -188,14 +188,15 @@ pipelines:
188188
- path: /boot/efi
189189
mode: 493
190190
- type: org.osbuild.ignition
191-
# Deploy via OSTree repo if specified, otherwise ociarchive or container.
192-
- mpp-if: ostree_repo != ''
191+
# Deploy via ociarchive or container
192+
- mpp-if: ociarchive != ''
193193
then:
194-
type: org.osbuild.ostree.deploy
194+
type: org.osbuild.ostree.deploy.container
195195
options:
196196
osname:
197197
mpp-format-string: '{osname}'
198-
remote: fedora
198+
target_imgref:
199+
mpp-format-string: '{container_imgref}'
199200
mounts:
200201
- /boot
201202
- /boot/efi
@@ -204,59 +205,34 @@ pipelines:
204205
- '$ignition_firstboot'
205206
- mpp-format-string: '{extra_kargs}'
206207
inputs:
207-
commits:
208-
type: org.osbuild.ostree
209-
origin: org.osbuild.source
210-
mpp-resolve-ostree-commits:
211-
commits:
212-
- ref: $ostree_ref
213-
remote:
214-
url: $ostree_repo
208+
images:
209+
type: org.osbuild.containers
210+
origin: org.osbuild.pipeline
211+
references:
212+
name:oci-archive:
213+
name: coreos.ociarchive
215214
else:
216-
mpp-if: ociarchive != ''
217-
then:
218-
type: org.osbuild.ostree.deploy.container
219-
options:
220-
osname:
221-
mpp-format-string: '{osname}'
222-
target_imgref:
223-
mpp-format-string: '{container_imgref}'
224-
mounts:
225-
- /boot
226-
- /boot/efi
227-
kernel_opts:
228-
- rw
229-
- '$ignition_firstboot'
230-
- mpp-format-string: '{extra_kargs}'
231-
inputs:
232-
images:
233-
type: org.osbuild.containers
234-
origin: org.osbuild.pipeline
235-
references:
236-
name:oci-archive:
237-
name: coreos.ociarchive
238-
else:
239-
type: org.osbuild.ostree.deploy.container
240-
options:
241-
osname:
242-
mpp-format-string: '{osname}'
243-
target_imgref:
244-
mpp-format-string: '{container_imgref}'
245-
mounts:
246-
- /boot
247-
- /boot/efi
248-
kernel_opts:
249-
- rw
250-
- '$ignition_firstboot'
251-
- mpp-format-string: '{extra_kargs}'
252-
inputs:
253-
images:
254-
type: org.osbuild.containers
255-
origin: org.osbuild.source
256-
mpp-resolve-images:
257-
images:
258-
- source: $container_repo
259-
tag: $container_tag
215+
type: org.osbuild.ostree.deploy.container
216+
options:
217+
osname:
218+
mpp-format-string: '{osname}'
219+
target_imgref:
220+
mpp-format-string: '{container_imgref}'
221+
mounts:
222+
- /boot
223+
- /boot/efi
224+
kernel_opts:
225+
- rw
226+
- '$ignition_firstboot'
227+
- mpp-format-string: '{extra_kargs}'
228+
inputs:
229+
images:
230+
type: org.osbuild.containers
231+
origin: org.osbuild.source
232+
mpp-resolve-images:
233+
images:
234+
- source: $container_repo
235+
tag: $container_tag
260236
- type: org.osbuild.ostree.aleph
261237
options:
262238
coreos_compat: true

‎src/osbuild-manifests/coreos.osbuild.ppc64le.mpp.yaml

Lines changed: 31 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -185,72 +185,49 @@ pipelines:
185185
# will always work.
186186
bootprefix: true
187187
- type: org.osbuild.ignition
188-
# Deploy via OSTree repo if specified, otherwise ociarchive or container.
189-
- mpp-if: ostree_repo != ''
188+
# Deploy via ociarchive or container
189+
- mpp-if: ociarchive != ''
190190
then:
191-
type: org.osbuild.ostree.deploy
191+
type: org.osbuild.ostree.deploy.container
192192
options:
193193
osname:
194194
mpp-format-string: '{osname}'
195-
remote: fedora
195+
target_imgref:
196+
mpp-format-string: '{container_imgref}'
196197
mounts:
197198
- /boot
198199
kernel_opts:
199200
- rw
200201
- '$ignition_firstboot'
201202
- mpp-format-string: '{extra_kargs}'
202203
inputs:
203-
commits:
204-
type: org.osbuild.ostree
205-
origin: org.osbuild.source
206-
mpp-resolve-ostree-commits:
207-
commits:
208-
- ref: $ostree_ref
209-
remote:
210-
url: $ostree_repo
204+
images:
205+
type: org.osbuild.containers
206+
origin: org.osbuild.pipeline
207+
references:
208+
name:oci-archive:
209+
name: coreos.ociarchive
211210
else:
212-
mpp-if: ociarchive != ''
213-
then:
214-
type: org.osbuild.ostree.deploy.container
215-
options:
216-
osname:
217-
mpp-format-string: '{osname}'
218-
target_imgref:
219-
mpp-format-string: '{container_imgref}'
220-
mounts:
221-
- /boot
222-
kernel_opts:
223-
- rw
224-
- '$ignition_firstboot'
225-
- mpp-format-string: '{extra_kargs}'
226-
inputs:
227-
images:
228-
type: org.osbuild.containers
229-
origin: org.osbuild.pipeline
230-
references:
231-
name:oci-archive:
232-
name: coreos.ociarchive
233-
else:
234-
type: org.osbuild.ostree.deploy.container
235-
options:
236-
osname:
237-
mpp-format-string: '{osname}'
238-
target_imgref:
239-
mpp-format-string: '{container_imgref}'
240-
mounts:
241-
- /boot
242-
kernel_opts:
243-
- rw
244-
- '$ignition_firstboot'
245-
- mpp-format-string: '{extra_kargs}'
246-
inputs:
247-
images:
248-
type: org.osbuild.containers
249-
origin: org.osbuild.source
250-
mpp-resolve-images:
251-
images:
252-
- source: $container_repo
253-
tag: $container_tag
211+
type: org.osbuild.ostree.deploy.container
212+
options:
213+
osname:
214+
mpp-format-string: '{osname}'
215+
target_imgref:
216+
mpp-format-string: '{container_imgref}'
217+
mounts:
218+
- /boot
219+
kernel_opts:
220+
- rw
221+
- '$ignition_firstboot'
222+
- mpp-format-string: '{extra_kargs}'
223+
inputs:
224+
images:
225+
type: org.osbuild.containers
226+
origin: org.osbuild.source
227+
mpp-resolve-images:
228+
images:
229+
- source: $container_repo
230+
tag: $container_tag
254231
# Drop the immutable bit here (we add it back later) because it
255232
# causes failures when cleaning up tmp dirs.
256233
- type: org.osbuild.chattr

‎src/osbuild-manifests/coreos.osbuild.riscv64.mpp.yaml

Lines changed: 32 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -188,14 +188,15 @@ pipelines:
188188
- path: /boot/efi
189189
mode: 493
190190
- type: org.osbuild.ignition
191-
# Deploy via OSTree repo if specified, otherwise ociarchive or container.
192-
- mpp-if: ostree_repo != ''
191+
# Deploy via ociarchive or container
192+
- mpp-if: ociarchive != ''
193193
then:
194-
type: org.osbuild.ostree.deploy
194+
type: org.osbuild.ostree.deploy.container
195195
options:
196196
osname:
197197
mpp-format-string: '{osname}'
198-
remote: fedora
198+
target_imgref:
199+
mpp-format-string: '{container_imgref}'
199200
mounts:
200201
- /boot
201202
- /boot/efi
@@ -204,59 +205,34 @@ pipelines:
204205
- '$ignition_firstboot'
205206
- mpp-format-string: '{extra_kargs}'
206207
inputs:
207-
commits:
208-
type: org.osbuild.ostree
209-
origin: org.osbuild.source
210-
mpp-resolve-ostree-commits:
211-
commits:
212-
- ref: $ostree_ref
213-
remote:
214-
url: $ostree_repo
208+
images:
209+
type: org.osbuild.containers
210+
origin: org.osbuild.pipeline
211+
references:
212+
name:oci-archive:
213+
name: coreos.ociarchive
215214
else:
216-
mpp-if: ociarchive != ''
217-
then:
218-
type: org.osbuild.ostree.deploy.container
219-
options:
220-
osname:
221-
mpp-format-string: '{osname}'
222-
target_imgref:
223-
mpp-format-string: '{container_imgref}'
224-
mounts:
225-
- /boot
226-
- /boot/efi
227-
kernel_opts:
228-
- rw
229-
- '$ignition_firstboot'
230-
- mpp-format-string: '{extra_kargs}'
231-
inputs:
232-
images:
233-
type: org.osbuild.containers
234-
origin: org.osbuild.pipeline
235-
references:
236-
name:oci-archive:
237-
name: coreos.ociarchive
238-
else:
239-
type: org.osbuild.ostree.deploy.container
240-
options:
241-
osname:
242-
mpp-format-string: '{osname}'
243-
target_imgref:
244-
mpp-format-string: '{container_imgref}'
245-
mounts:
246-
- /boot
247-
- /boot/efi
248-
kernel_opts:
249-
- rw
250-
- '$ignition_firstboot'
251-
- mpp-format-string: '{extra_kargs}'
252-
inputs:
253-
images:
254-
type: org.osbuild.containers
255-
origin: org.osbuild.source
256-
mpp-resolve-images:
257-
images:
258-
- source: $container_repo
259-
tag: $container_tag
215+
type: org.osbuild.ostree.deploy.container
216+
options:
217+
osname:
218+
mpp-format-string: '{osname}'
219+
target_imgref:
220+
mpp-format-string: '{container_imgref}'
221+
mounts:
222+
- /boot
223+
- /boot/efi
224+
kernel_opts:
225+
- rw
226+
- '$ignition_firstboot'
227+
- mpp-format-string: '{extra_kargs}'
228+
inputs:
229+
images:
230+
type: org.osbuild.containers
231+
origin: org.osbuild.source
232+
mpp-resolve-images:
233+
images:
234+
- source: $container_repo
235+
tag: $container_tag
260236
- type: org.osbuild.ostree.aleph
261237
options:
262238
coreos_compat: true

0 commit comments

Comments
 (0)