From 71a4173fc0641c8ec0ed193c9275112f1ac6875d Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Thu, 27 May 2021 12:54:26 +0200 Subject: images: remove sato/weston ptest images They have been replaced by core-image-minimal-ptest-fast/all (From OE-Core rev: 0d5bd979a9f67474c4da1d69377a1a1c2161ca6b) Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- .../images/core-image-weston-ptest-all.bb | 21 ----------------- .../images/core-image-weston-ptest-fast.bb | 20 ---------------- .../images/core-image-sato-ptest-fast.bb | 23 ------------------ .../images/core-image-sato-sdk-ptest.bb | 27 ---------------------- 4 files changed, 91 deletions(-) delete mode 100644 meta/recipes-graphics/images/core-image-weston-ptest-all.bb delete mode 100644 meta/recipes-graphics/images/core-image-weston-ptest-fast.bb delete mode 100644 meta/recipes-sato/images/core-image-sato-ptest-fast.bb delete mode 100644 meta/recipes-sato/images/core-image-sato-sdk-ptest.bb diff --git a/meta/recipes-graphics/images/core-image-weston-ptest-all.bb b/meta/recipes-graphics/images/core-image-weston-ptest-all.bb deleted file mode 100644 index a622779e6a..0000000000 --- a/meta/recipes-graphics/images/core-image-weston-ptest-all.bb +++ /dev/null @@ -1,21 +0,0 @@ -require core-image-weston-sdk.bb -require conf/distro/include/ptest-packagelists.inc - -DESCRIPTION += "Also includes ptest packages." - -# Include the full set of ptests -IMAGE_INSTALL += "${PTESTS_FAST} ${PTESTS_SLOW}" - -# This image is sufficiently large (~1.8GB) that we need to be careful that it fits in a live -# image (which has a 4GB limit), so nullify the overhead factor (1.3x out of the -# box) and explicitly add just 1100MB. -# strace-ptest in particular needs more than 500MB -IMAGE_OVERHEAD_FACTOR = "1.0" -IMAGE_ROOTFS_EXTRA_SPACE = "1124288" - -# ptests need more memory than standard to avoid the OOM killer -# also lttng-tools needs /tmp that has at least 1G -QB_MEM = "-m 2048" - -# Sadly at the moment the full set of ptests is not robust enough and sporadically fails in random places -PTEST_EXPECT_FAILURE = "1" diff --git a/meta/recipes-graphics/images/core-image-weston-ptest-fast.bb b/meta/recipes-graphics/images/core-image-weston-ptest-fast.bb deleted file mode 100644 index df02befb66..0000000000 --- a/meta/recipes-graphics/images/core-image-weston-ptest-fast.bb +++ /dev/null @@ -1,20 +0,0 @@ -require core-image-weston-sdk.bb -require conf/distro/include/ptest-packagelists.inc - -# Include only fast (< 30 sec) ptests -IMAGE_INSTALL += "${PTESTS_FAST}" - -DESCRIPTION += "Also includes ptest packages with fast execution times to allow for more automated QA." - -# This image is sufficiently large (~1.8GB) that it can't actually fit in a live -# image (which has a 4GB limit), so nullify the overhead factor (1.3x out of the -# box) and explicitly add just 1500MB. -# strace-ptest in particular needs more than 500MB -IMAGE_OVERHEAD_FACTOR = "1.0" -IMAGE_ROOTFS_EXTRA_SPACE = "1524288" - -# ptests need more memory than standard to avoid the OOM killer -QB_MEM = "-m 1024" - -# Sadly at the moment the fast set of ptests is not robust enough and sporadically fails in a couple of places -PTEST_EXPECT_FAILURE = "1" diff --git a/meta/recipes-sato/images/core-image-sato-ptest-fast.bb b/meta/recipes-sato/images/core-image-sato-ptest-fast.bb deleted file mode 100644 index d37ad00cf8..0000000000 --- a/meta/recipes-sato/images/core-image-sato-ptest-fast.bb +++ /dev/null @@ -1,23 +0,0 @@ -inherit features_check -REQUIRED_DISTRO_FEATURES = "ptest" - -require core-image-sato-sdk.bb -require conf/distro/include/ptest-packagelists.inc - -IMAGE_INSTALL += "${PTESTS_FAST}" - -DESCRIPTION += "Also includes ptest packages with fast execution times to allow for more automated QA." -HOMEPAGE = "https://www.yoctoproject.org/" - -# This image is sufficiently large (~1.8GB) that it can't actually fit in a live -# image (which has a 4GB limit), so nullify the overhead factor (1.3x out of the -# box) and explicitly add just 1500MB. -# strace-ptest in particular needs more than 500MB -IMAGE_OVERHEAD_FACTOR = "1.0" -IMAGE_ROOTFS_EXTRA_SPACE = "1524288" - -# ptests need more memory than standard to avoid the OOM killer -QB_MEM = "-m 1024" - -# Sadly at the moment the fast set of ptests is not robust enough and sporadically fails in a couple of places -PTEST_EXPECT_FAILURE = "1" diff --git a/meta/recipes-sato/images/core-image-sato-sdk-ptest.bb b/meta/recipes-sato/images/core-image-sato-sdk-ptest.bb deleted file mode 100644 index eea89a5d6c..0000000000 --- a/meta/recipes-sato/images/core-image-sato-sdk-ptest.bb +++ /dev/null @@ -1,27 +0,0 @@ -inherit features_check -REQUIRED_DISTRO_FEATURES = "ptest" - -require core-image-sato-sdk.bb -require conf/distro/include/ptest-packagelists.inc - -DESCRIPTION += "Also includes ptest packages." -HOMEPAGE = "https://www.yoctoproject.org/" - -PROVIDES += "core-image-sato-ptest" - -# Also include ptests which may not otherwise be included in a sato image -IMAGE_INSTALL += "${PTESTS_FAST} ${PTESTS_SLOW}" - -# This image is sufficiently large (~1.8GB) that we need to be careful that it fits in a live -# image (which has a 4GB limit), so nullify the overhead factor (1.3x out of the -# box) and explicitly add just 1100MB. -# strace-ptest in particular needs more than 500MB -IMAGE_OVERHEAD_FACTOR = "1.0" -IMAGE_ROOTFS_EXTRA_SPACE = "1124288" - -# ptests need more memory than standard to avoid the OOM killer -# also lttng-tools needs /tmp that has at least 1G -QB_MEM = "-m 2048" - -# Sadly at the moment the full set of ptests is not robust enough and sporadically fails in random places -PTEST_EXPECT_FAILURE = "1" -- cgit v1.2.3-54-g00ecf