From 681ed72b5c6877f05b2b7484520a29c55a3ec3fd Mon Sep 17 00:00:00 2001 From: Naoto Yamaguchi Date: Tue, 26 Nov 2024 02:27:23 +0900 Subject: Re-enable drm lease test image This patch enable drm-lease-test image that based on container manager. Bug-AGL: SPEC-5308 Change-Id: I7301901d2ab0331a70dc031363c4133cea0bc532 Signed-off-by: Naoto Yamaguchi --- .../drm-lease-test-cluster.mount | 11 ++++++++++ .../image-mount-drm-lease-test-cluster_1.0.bb | 24 ++++++++++++++++++++++ .../drm-lease-test-ivi.mount | 11 ++++++++++ .../image-mount-drm-lease-test-ivi_1.0.bb | 24 ++++++++++++++++++++++ .../images/agl-host-image-drm-lease-test.bb | 20 ++++++++++++++++-- 5 files changed, 88 insertions(+), 2 deletions(-) create mode 100644 meta-agl-ic-container/recipes-platform/drm-lease-test/image-mount-drm-lease-test-cluster/drm-lease-test-cluster.mount create mode 100644 meta-agl-ic-container/recipes-platform/drm-lease-test/image-mount-drm-lease-test-cluster_1.0.bb create mode 100644 meta-agl-ic-container/recipes-platform/drm-lease-test/image-mount-drm-lease-test-ivi/drm-lease-test-ivi.mount create mode 100644 meta-agl-ic-container/recipes-platform/drm-lease-test/image-mount-drm-lease-test-ivi_1.0.bb (limited to 'meta-agl-ic-container/recipes-platform') diff --git a/meta-agl-ic-container/recipes-platform/drm-lease-test/image-mount-drm-lease-test-cluster/drm-lease-test-cluster.mount b/meta-agl-ic-container/recipes-platform/drm-lease-test/image-mount-drm-lease-test-cluster/drm-lease-test-cluster.mount new file mode 100644 index 00000000..8415cd8c --- /dev/null +++ b/meta-agl-ic-container/recipes-platform/drm-lease-test/image-mount-drm-lease-test-cluster/drm-lease-test-cluster.mount @@ -0,0 +1,11 @@ +[Unit] +Description=Image mount for drl-lease-test-cluster + +[Mount] +What=/var/lib/machines/guest-image-drm-lease-test-cluster.ext4 +Where=/var/lib/machines/guest1 +Type=ext4 +Options=rw + +[Install] +WantedBy=local-fs.target diff --git a/meta-agl-ic-container/recipes-platform/drm-lease-test/image-mount-drm-lease-test-cluster_1.0.bb b/meta-agl-ic-container/recipes-platform/drm-lease-test/image-mount-drm-lease-test-cluster_1.0.bb new file mode 100644 index 00000000..7ab01743 --- /dev/null +++ b/meta-agl-ic-container/recipes-platform/drm-lease-test/image-mount-drm-lease-test-cluster_1.0.bb @@ -0,0 +1,24 @@ +SUMMARY = "AGL CI guest image mounter for drm-lease-test-cluster." +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302" + +SRC_URI += " \ + file://drm-lease-test-cluster.mount \ +" + +inherit systemd + +SYSTEMD_PACKAGES = "${PN}" +SYSTEMD_SERVICE:${PN} = "var-lib-machines-guest1.mount" +SYSTEMD_AUTO_ENABLE:${PN} = "enable" + +do_install:append () { + install -d ${D}${systemd_system_unitdir} + install -m 0644 ${WORKDIR}/drm-lease-test-cluster.mount ${D}${systemd_system_unitdir}/var-lib-machines-guest1.mount + install -d ${D}/var/lib/machines/guest1 +} + +FILES:${PN} += " \ + ${systemd_system_unitdir} \ + /var/lib/machines/* \ +" diff --git a/meta-agl-ic-container/recipes-platform/drm-lease-test/image-mount-drm-lease-test-ivi/drm-lease-test-ivi.mount b/meta-agl-ic-container/recipes-platform/drm-lease-test/image-mount-drm-lease-test-ivi/drm-lease-test-ivi.mount new file mode 100644 index 00000000..252dc61c --- /dev/null +++ b/meta-agl-ic-container/recipes-platform/drm-lease-test/image-mount-drm-lease-test-ivi/drm-lease-test-ivi.mount @@ -0,0 +1,11 @@ +[Unit] +Description=Image mount for drl-lease-test-cluster + +[Mount] +What=/var/lib/machines/guest-image-drm-lease-test-ivi.ext4 +Where=/var/lib/machines/guest2 +Type=ext4 +Options=rw + +[Install] +WantedBy=local-fs.target diff --git a/meta-agl-ic-container/recipes-platform/drm-lease-test/image-mount-drm-lease-test-ivi_1.0.bb b/meta-agl-ic-container/recipes-platform/drm-lease-test/image-mount-drm-lease-test-ivi_1.0.bb new file mode 100644 index 00000000..2c0607f0 --- /dev/null +++ b/meta-agl-ic-container/recipes-platform/drm-lease-test/image-mount-drm-lease-test-ivi_1.0.bb @@ -0,0 +1,24 @@ +SUMMARY = "AGL CI guest image mounter for drm-lease-test-ivi." +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302" + +SRC_URI += " \ + file://drm-lease-test-ivi.mount \ +" + +inherit systemd + +SYSTEMD_PACKAGES = "${PN}" +SYSTEMD_SERVICE:${PN} = "var-lib-machines-guest2.mount" +SYSTEMD_AUTO_ENABLE:${PN} = "enable" + +do_install:append () { + install -d ${D}${systemd_system_unitdir} + install -m 0644 ${WORKDIR}/drm-lease-test-ivi.mount ${D}${systemd_system_unitdir}/var-lib-machines-guest2.mount + install -d ${D}/var/lib/machines/guest2 +} + +FILES:${PN} += " \ + ${systemd_system_unitdir} \ + /var/lib/machines/* \ +" diff --git a/meta-agl-ic-container/recipes-platform/images/agl-host-image-drm-lease-test.bb b/meta-agl-ic-container/recipes-platform/images/agl-host-image-drm-lease-test.bb index 09b6ddac..5b751c0c 100644 --- a/meta-agl-ic-container/recipes-platform/images/agl-host-image-drm-lease-test.bb +++ b/meta-agl-ic-container/recipes-platform/images/agl-host-image-drm-lease-test.bb @@ -2,8 +2,7 @@ SUMMARY = "DRM Lease LXC test host image" LICENSE = "MIT" require lxc-host-image-minimal.bb -require recipes-platform/images/agl-lxc-install-single-image.inc -require recipes-platform/images/agl-lxc-autostart.inc +require recipes-platform/images/agl-lxc-multiconfig-build.inc CONTAINER_IMAGES ?= "agl-container-ivi:guest-image-drm-lease-test-ivi \ agl-container-cluster:guest-image-drm-lease-test-cluster \ @@ -15,6 +14,9 @@ IMAGE_INSTALL += " \ # packages required for network bridge settings via lxc-net IMAGE_INSTALL += " \ + container-manager \ + cm-config-drm-lease-test-cluster image-mount-drm-lease-test-cluster \ + cm-config-drm-lease-test-ivi image-mount-drm-lease-test-ivi \ lxc-networking \ iptables-modules \ dnsmasq \ @@ -23,5 +25,19 @@ IMAGE_INSTALL += " \ kernel-module-xt-multiport \ " +install_container_images() { + for c in ${CONTAINER_IMAGES}; do + config=${c%:*} + image=${c#*:} + name=${image#guest-image-} + src="${TOPDIR}/tmp-${config}/deploy/images/${MACHINE}/${image}-${MACHINE}${MACHINE_SUFFIX}${IMAGE_NAME_SUFFIX}.ext4" + bbnote "Installing ${src}" + install -Dm644 ${src} ${IMAGE_ROOTFS}/var/lib/machines/${image}.ext4 + done +} + +ROOTFS_POSTPROCESS_COMMAND += "install_container_images; " + + # Under the this line, shall describe machine specific package. IMAGE_INSTALL:append:rcar-gen3 = " kernel-module-gles gles-user-module-firmware" -- cgit 1.2.3-korg