From 9b0d35c6737e0cb3f49e81497c2fe7431957828b Mon Sep 17 00:00:00 2001 From: Simon de Vlieger Date: Wed, 2 Oct 2024 11:22:22 +0200 Subject: [PATCH] example/centos: shared packages for qcow2/vmdk The build packages for the qcow2 and vmdk pipelines are identical. Let's make them both use the same include. Signed-off-by: Simon de Vlieger --- example/centos/centos-9-x86_64-qcow2.yaml | 2 +- example/centos/centos-9-x86_64-vmdk.yaml | 2 +- .../x86_64/build/{qcow2.yaml => qcow2_vmdk.yaml} | 0 example/centos/common/package-set/x86_64/build/vmdk.yaml | 8 -------- 4 files changed, 2 insertions(+), 10 deletions(-) rename example/centos/common/package-set/x86_64/build/{qcow2.yaml => qcow2_vmdk.yaml} (100%) delete mode 100644 example/centos/common/package-set/x86_64/build/vmdk.yaml diff --git a/example/centos/centos-9-x86_64-qcow2.yaml b/example/centos/centos-9-x86_64-qcow2.yaml index ec4e2933..b1636ab7 100644 --- a/example/centos/centos-9-x86_64-qcow2.yaml +++ b/example/centos/centos-9-x86_64-qcow2.yaml @@ -17,7 +17,7 @@ otk.define: repositories: otk.include: "common/repositories/${architecture}.yaml" packages: - otk.include: "common/package-set/${architecture}/build/qcow2.yaml" + otk.include: "common/package-set/${architecture}/build/qcow2_vmdk.yaml" os: otk.external.osbuild-gen-depsolve-dnf4: architecture: ${architecture} diff --git a/example/centos/centos-9-x86_64-vmdk.yaml b/example/centos/centos-9-x86_64-vmdk.yaml index 39b8c755..9802dd23 100644 --- a/example/centos/centos-9-x86_64-vmdk.yaml +++ b/example/centos/centos-9-x86_64-vmdk.yaml @@ -16,7 +16,7 @@ otk.define: repositories: otk.include: "common/repositories/${architecture}.yaml" packages: - otk.include: "common/package-set/${architecture}/build/vmdk.yaml" + otk.include: "common/package-set/${architecture}/build/qcow2_vmdk.yaml" os: otk.external.osbuild-gen-depsolve-dnf4: architecture: ${architecture} diff --git a/example/centos/common/package-set/x86_64/build/qcow2.yaml b/example/centos/common/package-set/x86_64/build/qcow2_vmdk.yaml similarity index 100% rename from example/centos/common/package-set/x86_64/build/qcow2.yaml rename to example/centos/common/package-set/x86_64/build/qcow2_vmdk.yaml diff --git a/example/centos/common/package-set/x86_64/build/vmdk.yaml b/example/centos/common/package-set/x86_64/build/vmdk.yaml deleted file mode 100644 index 986f06f1..00000000 --- a/example/centos/common/package-set/x86_64/build/vmdk.yaml +++ /dev/null @@ -1,8 +0,0 @@ -include: - otk.op.join: - values: - - otk.include: "_include.yaml" - - - dosfstools - - qemu-img - - xfsprogs -exclude: []