diff --git a/layers/meta-belden-coreos/classes/coreos-image-ci.bbclass b/layers/meta-belden-coreos/classes/coreos-image-ci.bbclass index 890cbd9..95d4ec1 100644 --- a/layers/meta-belden-coreos/classes/coreos-image-ci.bbclass +++ b/layers/meta-belden-coreos/classes/coreos-image-ci.bbclass @@ -3,6 +3,7 @@ # > COREOS_IMAGE_EXTRACLASSES += "coreos-image-ci" # in auto.conf (or local.conf) +inherit kernel-artifact-names def get_coreos_ci_artifacts(d): artifacts = [] @@ -12,11 +13,11 @@ def get_coreos_ci_artifacts(d): # Container handling # ========================================================================== - + if bb.utils.contains('IMAGE_FSTYPES', 'oci', True, False, d): artifacts.append(d.getVar('IMAGE_LINK_NAME') + '.rootfs-oci.tar') - + # Special case for container, we just need the OCI tarball return " ".join(artifacts) @@ -25,10 +26,14 @@ def get_coreos_ci_artifacts(d): if bb.utils.contains('IMAGE_FSTYPES', 'wic.xz', True, False, d): artifacts.append(d.getVar('IMAGE_LINK_NAME') + '.wic.xz') - + if bb.utils.contains('IMAGE_FSTYPES', 'wic.bmap', True, False, d): artifacts.append(d.getVar('IMAGE_LINK_NAME') + '.wic.bmap') + # This is used for qemu-coreos-arm64 + if bb.utils.contains('IMAGE_FSTYPES', 'wic.qcow2', True, False, d): + artifacts.append(d.getVar('IMAGE_LINK_NAME') + '.wic.qcow2') + if d.getVar('COREOS_IMAGE_GENERATE_SWU') == '1': artifacts.append(d.getVar('IMAGE_LINK_NAME') + '.swu') @@ -90,5 +95,5 @@ do_deploy_ci() { for file in ${COREOS_CI_DEPLOY_ARTIFACTS}; do echo $file >> $output done -} +} addtask deploy_ci after do_image before do_build \ No newline at end of file