From aedf6eb9ff3745eed314ff712aff2be7b7a378eb Mon Sep 17 00:00:00 2001 From: Simon de Vlieger Date: Mon, 23 Sep 2024 17:33:14 +0200 Subject: [PATCH] example/centos: split build pipeline This can probably share more later but for now split out the build pipeline into one that needs tar and one that doesn't. Signed-off-by: Simon de Vlieger --- example/centos/centos-9-aarch64-qcow2.yaml | 2 +- example/centos/centos-9-x86_64-qcow2.yaml | 2 +- example/centos/pipeline/build/generic.yaml | 12 ++++++++++++ example/centos/pipeline/build/tar.yaml | 13 +++++++++++++ 4 files changed, 27 insertions(+), 2 deletions(-) create mode 100644 example/centos/pipeline/build/generic.yaml create mode 100644 example/centos/pipeline/build/tar.yaml diff --git a/example/centos/centos-9-aarch64-qcow2.yaml b/example/centos/centos-9-aarch64-qcow2.yaml index 2e7b9482..64e4c516 100644 --- a/example/centos/centos-9-aarch64-qcow2.yaml +++ b/example/centos/centos-9-aarch64-qcow2.yaml @@ -108,7 +108,7 @@ otk.include: "common/partition-table/aarch64.yaml" otk.target.osbuild: pipelines: - - otk.include: "pipeline/build.yaml" + - otk.include: "pipeline/build/generic.yaml" - name: os build: name:build stages: diff --git a/example/centos/centos-9-x86_64-qcow2.yaml b/example/centos/centos-9-x86_64-qcow2.yaml index 7e5051e2..2f7de30a 100644 --- a/example/centos/centos-9-x86_64-qcow2.yaml +++ b/example/centos/centos-9-x86_64-qcow2.yaml @@ -109,7 +109,7 @@ otk.include: "common/partition-table/x86_64.yaml" otk.target.osbuild: pipelines: - - otk.include: "pipeline/build.yaml" + - otk.include: "pipeline/build/generic.yaml" - name: os build: name:build stages: diff --git a/example/centos/pipeline/build/generic.yaml b/example/centos/pipeline/build/generic.yaml new file mode 100644 index 00000000..2d35c41c --- /dev/null +++ b/example/centos/pipeline/build/generic.yaml @@ -0,0 +1,12 @@ +name: build +runner: "org.osbuild.centos9" +stages: + - otk.external.osbuild-make-depsolve-dnf4-rpm-stage: + packageset: ${packages.build} + gpgkeys: + otk.include: "../../common/gpgkeys.yaml" + - type: org.osbuild.selinux + options: + file_contexts: etc/selinux/targeted/contexts/files/file_contexts + labels: + /usr/bin/cp: system_u:object_r:install_exec_t:s0 diff --git a/example/centos/pipeline/build/tar.yaml b/example/centos/pipeline/build/tar.yaml new file mode 100644 index 00000000..6536f138 --- /dev/null +++ b/example/centos/pipeline/build/tar.yaml @@ -0,0 +1,13 @@ +name: build +runner: "org.osbuild.centos9" +stages: + - otk.external.osbuild-make-depsolve-dnf4-rpm-stage: + packageset: ${packages.build} + gpgkeys: + otk.include: "../../common/gpgkeys.yaml" + - type: org.osbuild.selinux + options: + file_contexts: etc/selinux/targeted/contexts/files/file_contexts + labels: + /usr/bin/cp: system_u:object_r:install_exec_t:s0 + /usr/bin/tar: system_u:object_r:install_exec_t:s0