Re: [meta-virtualization][master][PATCH 1/2] catatonit: Integrate version 0.1.7

[Bruce Ashfield <bruce.ashfield@gmail.com>]

These two changes are merged to master.

With respect to kirkstone, the issue is that by default the ptests
are built .. as such we are bringing in new dependencies to the
default build. That carries a bit of risk.

If there was a way to make the ptest build and dependencies optional,
and disabled by default, I'd be willing to merge that to kirkstone.

Bruce

In message: [meta-virtualization][master][PATCH 1/2] catatonit: Integrate version 0.1.7
on 05/09/2022 Andrei Gherzan wrote:

> From: Andrei Gherzan <andrei.gherzan@huawei.com>
> 
> This is useful for podman system tests.
> 
> Signed-off-by: Andrei Gherzan <andrei.gherzan@huawei.com>
> ---
>  recipes-containers/catatonit/catatonit_0.1.7.bb | 16 ++++++++++++++++
>  1 file changed, 16 insertions(+)
>  create mode 100644 recipes-containers/catatonit/catatonit_0.1.7.bb
> 
> diff --git a/recipes-containers/catatonit/catatonit_0.1.7.bb b/recipes-containers/catatonit/catatonit_0.1.7.bb
> new file mode 100644
> index 0000000..da3973d
> --- /dev/null
> +++ b/recipes-containers/catatonit/catatonit_0.1.7.bb
> @@ -0,0 +1,16 @@
> +# SPDX-FileCopyrightText: Huawei Inc.
> +#
> +# SPDX-License-Identifier: MIT
> +
> +SUMMARY = "A container init that is so simple it's effectively brain-dead."
> +HOMEPAGE = "https://github.com/openSUSE/catatonit"
> +DESCRIPTION = "${SUMMARY}"
> +SECTION = "base"
> +LICENSE = "GPL-3.0-or-later"
> +LIC_FILES_CHKSUM = "file://COPYING;md5=1ebbd3e34237af26da5dc08a4e440464"
> +
> +SRC_URI = "git://github.com/openSUSE/${BPN};protocol=https;branch=main"
> +SRCREV = "d8d72fea155c144ed3bf298a35a1aba5625a5656"
> +S = "${WORKDIR}/git"
> +
> +inherit autotools
> -- 
> 2.25.1
> 

> 
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#7594): https://lists.yoctoproject.org/g/meta-virtualization/message/7594
> Mute This Topic: https://lists.yoctoproject.org/mt/93476479/1050810
> Group Owner: meta-virtualization+owner@lists.yoctoproject.org
> Unsubscribe: https://lists.yoctoproject.org/g/meta-virtualization/unsub [bruce.ashfield@gmail.com]
> -=-=-=-=-=-=-=-=-=-=-=-
> 


In message: [meta-virtualization][master][PATCH 2/2] podman: Add ptest support for system tests
on 05/09/2022 Andrei Gherzan wrote:

> From: Andrei Gherzan <andrei.gherzan@huawei.com>
> 
> Signed-off-by: Andrei Gherzan <andrei.gherzan@huawei.com>
> ---
>  recipes-containers/podman/podman/run-ptest | 13 +++++++++++
>  recipes-containers/podman/podman_git.bb    | 27 +++++++++++++++++++++-
>  2 files changed, 39 insertions(+), 1 deletion(-)
>  create mode 100644 recipes-containers/podman/podman/run-ptest
> 
> diff --git a/recipes-containers/podman/podman/run-ptest b/recipes-containers/podman/podman/run-ptest
> new file mode 100644
> index 0000000..108ff45
> --- /dev/null
> +++ b/recipes-containers/podman/podman/run-ptest
> @@ -0,0 +1,13 @@
> +#!/bin/sh
> +
> +# SPDX-FileCopyrightText: Huawei Inc.
> +#
> +# SPDX-License-Identifier: MIT
> +
> +#
> +# Podman system tests
> +#
> +
> +# The system tests don't need any go related variables. Dummy-define them to
> +# avoid useless warnings/errors.
> +GOOS=undefined GO=true BUILDTAGS= make localsystem
> diff --git a/recipes-containers/podman/podman_git.bb b/recipes-containers/podman/podman_git.bb
> index e999192..e0d7164 100644
> --- a/recipes-containers/podman/podman_git.bb
> +++ b/recipes-containers/podman/podman_git.bb
> @@ -23,6 +23,7 @@ SRC_URI = " \
>      file://0001-Rename-BUILDFLAGS-to-GOBUILDFLAGS.patch;patchdir=src/import \
>      file://0002-Define-ActKillThread-equal-to-ActKill.patch;patchdir=src/import/vendor/github.com/seccomp/libseccomp-golang \
>      ${@bb.utils.contains('PACKAGECONFIG', 'rootless', 'file://50-podman-rootless.conf', '', d)} \
> +    file://run-ptest \
>  "
>  
>  LICENSE = "Apache-2.0"
> @@ -48,7 +49,7 @@ export LDFLAGS=""
>  TOOLCHAIN = "gcc"
>  
>  inherit go goarch
> -inherit systemd pkgconfig
> +inherit systemd pkgconfig ptest
>  
>  do_configure[noexec] = "1"
>  
> @@ -109,6 +110,17 @@ do_install() {
>  	fi
>  }
>  
> +do_install_ptest () {
> +	cp ${S}/src/import/Makefile ${D}${PTEST_PATH}
> +	install -d ${D}${PTEST_PATH}/test
> +	cp -r ${S}/src/import/test/system ${D}${PTEST_PATH}/test
> +
> +	# Some compatibility links for the Makefile assumptions.
> +	install -d ${D}${PTEST_PATH}/bin
> +	ln -s ${bindir}/podman ${D}${PTEST_PATH}/bin/podman
> +	ln -s ${bindir}/podman-remote ${D}${PTEST_PATH}/bin/podman-remote
> +}
> +
>  FILES:${PN} += " \
>      ${systemd_unitdir}/system/* \
>      ${systemd_unitdir}/user/* \
> @@ -128,3 +140,16 @@ RDEPENDS:${PN} += "\
>  "
>  RRECOMMENDS:${PN} += "slirp4netns kernel-module-xt-masquerade kernel-module-xt-comment"
>  RCONFLICTS:${PN} = "${@bb.utils.contains('PACKAGECONFIG', 'docker', 'docker', '', d)}"
> +
> +RDEPENDS:${PN}-ptest += " \
> +	bash \
> +	bats \
> +	buildah \
> +	catatonit \
> +	coreutils \
> +	file \
> +	gnupg \
> +	jq \
> +	make \
> +	tar \
> +"
> -- 
> 2.25.1
> 

> 
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#7595): https://lists.yoctoproject.org/g/meta-virtualization/message/7595
> Mute This Topic: https://lists.yoctoproject.org/mt/93476480/1050810
> Group Owner: meta-virtualization+owner@lists.yoctoproject.org
> Unsubscribe: https://lists.yoctoproject.org/g/meta-virtualization/unsub [bruce.ashfield@gmail.com]
> -=-=-=-=-=-=-=-=-=-=-=-
>