Skip to content

Commit

Permalink
example/centos: rename externals
Browse files Browse the repository at this point in the history
Rename all externals to the new names as used in `images`.

Signed-off-by: Simon de Vlieger <[email protected]>
  • Loading branch information
supakeen committed Oct 7, 2024
1 parent 4cc7685 commit 2625f61
Show file tree
Hide file tree
Showing 22 changed files with 30 additions and 30 deletions.
2 changes: 1 addition & 1 deletion example/centos/centos-9-aarch64-ami.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -201,7 +201,7 @@ otk.target.osbuild:
options:
config:
PasswordAuthentication: false
- otk.external.otk-make-fstab-stage:
- otk.external.osbuild-make-fstab-stage:
${filesystem}
- otk.include: fragment/grub2/${architecture}.yaml
- type: org.osbuild.systemd
Expand Down
2 changes: 1 addition & 1 deletion example/centos/centos-9-aarch64-minimal-raw.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ otk.target.osbuild:
Unit:
ConditionPathExists: '!/usr/libexec/greenboot/greenboot'
unit-type: global
- otk.external.otk-make-fstab-stage:
- otk.external.osbuild-make-fstab-stage:
${filesystem}
- otk.include: fragment/grub2/${architecture}.yaml
- type: org.osbuild.copy
Expand Down
2 changes: 1 addition & 1 deletion example/centos/centos-9-aarch64-qcow2.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@ otk.target.osbuild:
network:
networking: true
no_zero_conf: true
- otk.external.otk-make-fstab-stage:
- otk.external.osbuild-make-fstab-stage:
${filesystem}
- otk.include: fragment/grub2/${architecture}.yaml
- type: org.osbuild.systemd
Expand Down
2 changes: 1 addition & 1 deletion example/centos/centos-9-aarch64-vhd.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -252,7 +252,7 @@ otk.target.osbuild:
arg: NM_UNMANAGED
op: '='
val: '1'
- otk.external.otk-make-fstab-stage:
- otk.external.osbuild-make-fstab-stage:
${filesystem}
- type: org.osbuild.grub2
options:
Expand Down
2 changes: 1 addition & 1 deletion example/centos/centos-9-s390x-qcow2.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@ otk.target.osbuild:
network:
networking: true
no_zero_conf: true
- otk.external.otk-make-fstab-stage:
- otk.external.osbuild-make-fstab-stage:
${filesystem}
- type: org.osbuild.zipl
options: {}
Expand Down
2 changes: 1 addition & 1 deletion example/centos/centos-9-x86_64-ami.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -220,7 +220,7 @@ otk.target.osbuild:
options:
config:
PasswordAuthentication: false
- otk.external.otk-make-fstab-stage:
- otk.external.osbuild-make-fstab-stage:
${filesystem}
- otk.include: "fragment/grub2/${architecture}.yaml"
- type: org.osbuild.systemd
Expand Down
2 changes: 1 addition & 1 deletion example/centos/centos-9-x86_64-minimal-raw.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ otk.target.osbuild:
Unit:
ConditionPathExists: '!/usr/libexec/greenboot/greenboot'
unit-type: global
- otk.external.otk-make-fstab-stage:
- otk.external.osbuild-make-fstab-stage:
${filesystem}
- otk.include: fragment/grub2/${architecture}-no-bios.yaml
- type: org.osbuild.copy
Expand Down
2 changes: 1 addition & 1 deletion example/centos/centos-9-x86_64-ova.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ otk.target.osbuild:
network:
networking: true
no_zero_conf: true
- otk.external.otk-make-fstab-stage:
- otk.external.osbuild-make-fstab-stage:
${filesystem}
- otk.include: "fragment/grub2/${architecture}.yaml"
- otk.include: "fragment/selinux/targeted.yaml"
Expand Down
2 changes: 1 addition & 1 deletion example/centos/centos-9-x86_64-qcow2.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@ otk.target.osbuild:
network:
networking: true
no_zero_conf: true
- otk.external.otk-make-fstab-stage:
- otk.external.osbuild-make-fstab-stage:
${filesystem}
- otk.include: "fragment/grub2/${architecture}.yaml"
- type: org.osbuild.systemd
Expand Down
2 changes: 1 addition & 1 deletion example/centos/centos-9-x86_64-vhd.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -252,7 +252,7 @@ otk.target.osbuild:
arg: NM_UNMANAGED
op: '='
val: '1'
- otk.external.otk-make-fstab-stage:
- otk.external.osbuild-make-fstab-stage:
${filesystem}
- type: org.osbuild.grub2
options:
Expand Down
2 changes: 1 addition & 1 deletion example/centos/centos-9-x86_64-vmdk.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ otk.target.osbuild:
network:
networking: true
no_zero_conf: true
- otk.external.otk-make-fstab-stage:
- otk.external.osbuild-make-fstab-stage:
${filesystem}
- otk.include: "fragment/grub2/${architecture}.yaml"
- otk.include: "fragment/selinux/targeted.yaml"
Expand Down
4 changes: 2 additions & 2 deletions example/centos/common/partition-table/aarch64/default.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
otk.define:
filesystem:
otk.external.otk-gen-partition-table:
otk.external.osbuild-gen-partition-table:
modifications:
${filesystem.modifications}
properties:
Expand Down Expand Up @@ -36,5 +36,5 @@ otk.define:
# XXX: it would be nicer if the "fs_options" could be part of their
# stages directly without this indirection.
fs_options:
otk.external.otk-make-partition-mounts-devices:
otk.external.osbuild-make-partition-mounts-devices:
${filesystem}
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
otk.define:
filesystem:
otk.external.otk-gen-partition-table:
otk.external.osbuild-gen-partition-table:
modifications:
${filesystem.modifications}
properties:
Expand Down Expand Up @@ -37,5 +37,5 @@ otk.define:
# XXX: it would be nicer if the "fs_options" could be part of their
# stages directly without this indirection.
fs_options:
otk.external.otk-make-partition-mounts-devices:
otk.external.osbuild-make-partition-mounts-devices:
${filesystem}
4 changes: 2 additions & 2 deletions example/centos/common/partition-table/aarch64/vhd.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
otk.define:
filesystem:
otk.external.otk-gen-partition-table:
otk.external.osbuild-gen-partition-table:
modifications:
${filesystem.modifications}
properties:
Expand Down Expand Up @@ -36,5 +36,5 @@ otk.define:
# XXX: it would be nicer if the "fs_options" could be part of their
# stages directly without this indirection.
fs_options:
otk.external.otk-make-partition-mounts-devices:
otk.external.osbuild-make-partition-mounts-devices:
${filesystem}
4 changes: 2 additions & 2 deletions example/centos/common/partition-table/s390x/default.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
otk.define:
filesystem:
otk.external.otk-gen-partition-table:
otk.external.osbuild-gen-partition-table:
modifications:
${filesystem.modifications}
properties:
Expand All @@ -26,5 +26,5 @@ otk.define:
# XXX: it would be nicer if the "fs_options" could be part of their
# stages directly without this indirection.
fs_options:
otk.external.otk-make-partition-mounts-devices:
otk.external.osbuild-make-partition-mounts-devices:
${filesystem}
4 changes: 2 additions & 2 deletions example/centos/common/partition-table/x86_64/default.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
otk.define:
filesystem:
otk.external.otk-gen-partition-table:
otk.external.osbuild-gen-partition-table:
modifications:
${filesystem.modifications}
properties:
Expand Down Expand Up @@ -36,5 +36,5 @@ otk.define:
# XXX: it would be nicer if the "fs_options" could be part of their
# stages directly without this indirection.
fs_options:
otk.external.otk-make-partition-mounts-devices:
otk.external.osbuild-make-partition-mounts-devices:
${filesystem}
4 changes: 2 additions & 2 deletions example/centos/common/partition-table/x86_64/minimal-raw.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
otk.define:
filesystem:
otk.external.otk-gen-partition-table:
otk.external.osbuild-gen-partition-table:
modifications:
${filesystem.modifications}
properties:
Expand Down Expand Up @@ -37,5 +37,5 @@ otk.define:
# XXX: it would be nicer if the "fs_options" could be part of their
# stages directly without this indirection.
fs_options:
otk.external.otk-make-partition-mounts-devices:
otk.external.osbuild-make-partition-mounts-devices:
${filesystem}
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
otk.define:
filesystem:
otk.external.otk-gen-partition-table:
otk.external.osbuild-gen-partition-table:
modifications:
${filesystem.modifications}
properties:
Expand Down Expand Up @@ -36,5 +36,5 @@ otk.define:
# XXX: it would be nicer if the "fs_options" could be part of their
# stages directly without this indirection.
fs_options:
otk.external.otk-make-partition-mounts-devices:
otk.external.osbuild-make-partition-mounts-devices:
${filesystem}
2 changes: 1 addition & 1 deletion example/centos/pipeline/image/aarch64.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ build: name:build
stages:
otk.op.join:
values:
- otk.external.otk-make-partition-stages:
- otk.external.osbuild-make-partition-stages:
${filesystem}
- - type: org.osbuild.copy
inputs:
Expand Down
2 changes: 1 addition & 1 deletion example/centos/pipeline/image/s390x.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ build: name:build
stages:
otk.op.join:
values:
- otk.external.otk-make-partition-stages:
- otk.external.osbuild-make-partition-stages:
${filesystem}
- - type: org.osbuild.copy
inputs:
Expand Down
2 changes: 1 addition & 1 deletion example/centos/pipeline/image/x86_64-no-bios.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ build: name:build
stages:
otk.op.join:
values:
- otk.external.otk-make-partition-stages:
- otk.external.osbuild-make-partition-stages:
${filesystem}
- - type: org.osbuild.copy
inputs:
Expand Down
4 changes: 2 additions & 2 deletions example/centos/pipeline/image/x86_64.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ build: name:build
stages:
otk.op.join:
values:
- otk.external.otk-make-partition-stages:
- otk.external.osbuild-make-partition-stages:
${filesystem}
- - type: org.osbuild.copy
inputs:
Expand All @@ -21,6 +21,6 @@ stages:
mounts:
${fs_options.mounts}
# XXX conditional
- otk.external.otk-make-grub2-inst-stage:
- otk.external.osbuild-make-grub2-inst-stage:
platform: i386-pc
filesystem: ${filesystem}

0 comments on commit 2625f61

Please sign in to comment.