diff --git a/include/image-ostree.ipp.yml b/include/image-ostree.ipp.yml index a81aaff..fb807c1 100644 --- a/include/image-ostree.ipp.yml +++ b/include/image-ostree.ipp.yml @@ -96,114 +96,3 @@ pipelines: mpp-if: ostree_ref in locals().get("ostree_parent_refs", {}) then: mpp-eval: ostree_parent_refs[ostree_ref] -- name: image-tree - build: name:build - stages: - - type: org.osbuild.ostree.init-fs - - type: org.osbuild.ostree.pull - options: - repo: /ostree/repo - remote: - mpp-eval: ostree_remote_name - inputs: - commits: - type: org.osbuild.ostree - origin: org.osbuild.pipeline - references: - name:ostree-commit: - ref: - mpp-eval: ostree_ref - - type: org.osbuild.ostree.os-init - options: - osname: - mpp-eval: osname - - type: org.osbuild.ostree.config - options: - repo: /ostree/repo - config: - sysroot: - readonly: true - bootloader: none - - type: org.osbuild.ostree.remotes - options: - repo: /ostree/repo - remotes: - - name: - mpp-eval: ostree_remote_name - url: - mpp-eval: ostree_repo_url - - type: org.osbuild.mkdir - options: - paths: - - path: /boot/efi - mode: 448 - - type: org.osbuild.ostree.deploy - options: - osname: - mpp-eval: osname - ref: - mpp-eval: ostree_ref - remote: - mpp-eval: ostree_remote_name - mounts: - - /boot - - /boot/efi - rootfs: - label: root - kernel_opts: - mpp-eval: kernel_opts - - type: org.osbuild.ostree.fillvar - options: - deployment: - osname: - mpp-eval: osname - ref: - mpp-eval: ostree_ref - - type: org.osbuild.users - mounts: - - type: org.osbuild.ostree.deployment - name: ostree.deployment - options: - deployment: - osname: - mpp-eval: osname - ref: - mpp-eval: ostree_ref - options: - users: - root: - password: - mpp-eval: root_password - key: - mpp-eval: root_ssh_key - - type: org.osbuild.fstab - options: - ostree: - deployment: - osname: - mpp-eval: osname - ref: - mpp-eval: ostree_ref - filesystems: - mpp-eval: fstab - - type: org.osbuild.ostree.selinux - options: - deployment: - osname: - mpp-eval: osname - ref: - mpp-eval: ostree_ref - - type: org.osbuild.grub2 - options: - rootfs: - label: root - bootfs: - label: boot - uefi: - vendor: - mpp-eval: uefi_vendor - unified: false - install: true - legacy: true - write_defaults: false - greenboot: true diff --git a/include/image.ipp.yml b/include/image.ipp.yml index d6d4c26..dab0acc 100644 --- a/include/image.ipp.yml +++ b/include/image.ipp.yml @@ -11,9 +11,9 @@ mpp-vars: then: efi=runtime - mpp-eval: kernel_opts pipelines: -# Some variables need to be written to files, do that here +# Import pipeline with ostree specifics. - mpp-import-pipelines: - path: image-$image_type.ipp.yml + path: image-ostree.ipp.yml - name: container build: name:build