From be0088da5ab4df6406f3a3fd20ace00dd686a193 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Wed, 4 Oct 2023 19:08:36 -0700 Subject: images: Rename ptest images to rhyme with oe-core ptest images Easy to understand for new-comers. Signed-off-by: Khem Raj (cherry picked from commit 7b5cb622b4e40ceb7b150c83ee98c40fd24ab9aa) Signed-off-by: Armin Kuster --- .../recipes-core/images/meta-oe-image-ptest-all.bb | 25 +++++++++++++ .../images/meta-oe-image-ptest-fast.bb | 6 ++++ meta-oe/recipes-core/images/meta-oe-image-ptest.bb | 41 ++++++++++++++++++++++ .../recipes-core/images/meta-oe-ptest-all-image.bb | 25 ------------- .../images/meta-oe-ptest-fast-image.bb | 6 ---- meta-oe/recipes-core/images/meta-oe-ptest-image.bb | 41 ---------------------- .../images/meta-perl-image-ptest-all.bb | 25 +++++++++++++ .../images/meta-perl-image-ptest-fast.bb | 6 ++++ .../recipes-core/images/meta-perl-image-ptest.bb | 40 +++++++++++++++++++++ .../images/meta-perl-ptest-all-image.bb | 25 ------------- .../images/meta-perl-ptest-fast-image.bb | 6 ---- .../recipes-core/images/meta-perl-ptest-image.bb | 40 --------------------- .../images/meta-python-image-ptest-all.bb | 25 +++++++++++++ .../images/meta-python-image-ptest-fast.bb | 6 ++++ .../recipes-core/images/meta-python-image-ptest.bb | 40 +++++++++++++++++++++ .../images/meta-python-ptest-all-image.bb | 25 ------------- .../images/meta-python-ptest-fast-image.bb | 6 ---- .../recipes-core/images/meta-python-ptest-image.bb | 40 --------------------- 18 files changed, 214 insertions(+), 214 deletions(-) create mode 100644 meta-oe/recipes-core/images/meta-oe-image-ptest-all.bb create mode 100644 meta-oe/recipes-core/images/meta-oe-image-ptest-fast.bb create mode 100644 meta-oe/recipes-core/images/meta-oe-image-ptest.bb delete mode 100644 meta-oe/recipes-core/images/meta-oe-ptest-all-image.bb delete mode 100644 meta-oe/recipes-core/images/meta-oe-ptest-fast-image.bb delete mode 100644 meta-oe/recipes-core/images/meta-oe-ptest-image.bb create mode 100644 meta-perl/recipes-core/images/meta-perl-image-ptest-all.bb create mode 100644 meta-perl/recipes-core/images/meta-perl-image-ptest-fast.bb create mode 100644 meta-perl/recipes-core/images/meta-perl-image-ptest.bb delete mode 100644 meta-perl/recipes-core/images/meta-perl-ptest-all-image.bb delete mode 100644 meta-perl/recipes-core/images/meta-perl-ptest-fast-image.bb delete mode 100644 meta-perl/recipes-core/images/meta-perl-ptest-image.bb create mode 100644 meta-python/recipes-core/images/meta-python-image-ptest-all.bb create mode 100644 meta-python/recipes-core/images/meta-python-image-ptest-fast.bb create mode 100644 meta-python/recipes-core/images/meta-python-image-ptest.bb delete mode 100644 meta-python/recipes-core/images/meta-python-ptest-all-image.bb delete mode 100644 meta-python/recipes-core/images/meta-python-ptest-fast-image.bb delete mode 100644 meta-python/recipes-core/images/meta-python-ptest-image.bb diff --git a/meta-oe/recipes-core/images/meta-oe-image-ptest-all.bb b/meta-oe/recipes-core/images/meta-oe-image-ptest-all.bb new file mode 100644 index 0000000000..e8e1750b0e --- /dev/null +++ b/meta-oe/recipes-core/images/meta-oe-image-ptest-all.bb @@ -0,0 +1,25 @@ +DESCRIPTION = "Recipe to trigger execution of all meta-oe ptest images." +HOMEPAGE = "https://www.openembedded.org/" + +LICENSE = "MIT" + +inherit features_check nopackages +REQUIRED_DISTRO_FEATURES = "ptest" + +require conf/include/ptest-packagelists-meta-oe.inc + +# Include the full set of ptests +PTESTS_META_OE = "${PTESTS_FAST_META_OE} ${PTESTS_SLOW_META_OE}" + +do_testimage[noexec] = "1" +do_testimage[depends] = "${@' '.join(['meta-oe-image-ptest-'+x+':do_testimage' for x in d.getVar('PTESTS_META_OE').split()])}" + +do_build[depends] = "${@' '.join(['meta-oe-image-ptest-'+x+':do_build' for x in d.getVar('PTESTS_META_OE').split()])}" + +# normally image.bbclass would do this +EXCLUDE_FROM_WORLD = "1" + +python () { + if bb.utils.contains('IMAGE_CLASSES', 'testimage', True, False, d): + bb.build.addtask("do_testimage", "", "", d) +} diff --git a/meta-oe/recipes-core/images/meta-oe-image-ptest-fast.bb b/meta-oe/recipes-core/images/meta-oe-image-ptest-fast.bb new file mode 100644 index 0000000000..46b48d65d6 --- /dev/null +++ b/meta-oe/recipes-core/images/meta-oe-image-ptest-fast.bb @@ -0,0 +1,6 @@ +require meta-oe-image-ptest-all.bb + +DESCRIPTION = "Recipe to trigger execution of all fast meta-oe ptest images." + +PTESTS_META_OE = "${PTESTS_FAST_META_OE}" + diff --git a/meta-oe/recipes-core/images/meta-oe-image-ptest.bb b/meta-oe/recipes-core/images/meta-oe-image-ptest.bb new file mode 100644 index 0000000000..dd03022c57 --- /dev/null +++ b/meta-oe/recipes-core/images/meta-oe-image-ptest.bb @@ -0,0 +1,41 @@ +inherit features_check +REQUIRED_DISTRO_FEATURES = "ptest" + +require recipes-core/images/core-image-base.bb +require conf/include/ptest-packagelists-meta-oe.inc + +SUMMARY = "meta-oe ptest test image" + +DESCRIPTION += "Also including the ${MCNAME} ptest package." +HOMEPAGE = "https://www.openembedded.org/" + +PTESTS_META_OE = "${PTESTS_SLOW_META_OE} ${PTESTS_FAST_META_OE}" + +IMAGE_INSTALL:append = " ${MCNAME}-ptest openssh" + +BBCLASSEXTEND = "${@' '.join(['mcextend:'+x for x in d.getVar('PTESTS_META_OE').split()])}" + +# The image can be 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 up to 1500MB. +IMAGE_OVERHEAD_FACTOR = "1.0" +IMAGE_ROOTFS_EXTRA_SPACE = "324288" +# If a particular ptest needs more space, it can be customized: +#IMAGE_ROOTFS_EXTRA_SPACE:virtclass-mcextend- = "1024288" +IMAGE_ROOTFS_EXTRA_SPACE:virtclass-mcextend-poco = "1024288" + +# ptests need more memory than standard to avoid the OOM killer +QB_MEM = "-m 1024" +# If a particular ptest needs more memroy, it can be customized: +#QB_MEM:virtclass-mcextend- = "-m 4096" + +TEST_SUITES = "ping ssh parselogs ptest" + +# Sadly at the moment the full set of ptests is not robust enough and sporadically fails in random places +PTEST_EXPECT_FAILURE = "1" + +python () { + if not d.getVar("MCNAME"): + raise bb.parse.SkipRecipe("No class extension set") +} + diff --git a/meta-oe/recipes-core/images/meta-oe-ptest-all-image.bb b/meta-oe/recipes-core/images/meta-oe-ptest-all-image.bb deleted file mode 100644 index 0ea03dd2e3..0000000000 --- a/meta-oe/recipes-core/images/meta-oe-ptest-all-image.bb +++ /dev/null @@ -1,25 +0,0 @@ -DESCRIPTION = "Recipe to trigger execution of all meta-oe ptest images." -HOMEPAGE = "https://www.openembedded.org/" - -LICENSE = "MIT" - -inherit features_check nopackages -REQUIRED_DISTRO_FEATURES = "ptest" - -require conf/include/ptest-packagelists-meta-oe.inc - -# Include the full set of ptests -PTESTS_META_OE = "${PTESTS_FAST_META_OE} ${PTESTS_SLOW_META_OE}" - -do_testimage[noexec] = "1" -do_testimage[depends] = "${@' '.join(['meta-oe-ptest-image-'+x+':do_testimage' for x in d.getVar('PTESTS_META_OE').split()])}" - -do_build[depends] = "${@' '.join(['meta-oe-ptest-image-'+x+':do_build' for x in d.getVar('PTESTS_META_OE').split()])}" - -# normally image.bbclass would do this -EXCLUDE_FROM_WORLD = "1" - -python () { - if bb.utils.contains('IMAGE_CLASSES', 'testimage', True, False, d): - bb.build.addtask("do_testimage", "", "", d) -} diff --git a/meta-oe/recipes-core/images/meta-oe-ptest-fast-image.bb b/meta-oe/recipes-core/images/meta-oe-ptest-fast-image.bb deleted file mode 100644 index f56e841ff1..0000000000 --- a/meta-oe/recipes-core/images/meta-oe-ptest-fast-image.bb +++ /dev/null @@ -1,6 +0,0 @@ -require meta-oe-ptest-all-image.bb - -DESCRIPTION = "Recipe to trigger execution of all fast meta-oe ptest images." - -PTESTS_META_OE = "${PTESTS_FAST_META_OE}" - diff --git a/meta-oe/recipes-core/images/meta-oe-ptest-image.bb b/meta-oe/recipes-core/images/meta-oe-ptest-image.bb deleted file mode 100644 index dd03022c57..0000000000 --- a/meta-oe/recipes-core/images/meta-oe-ptest-image.bb +++ /dev/null @@ -1,41 +0,0 @@ -inherit features_check -REQUIRED_DISTRO_FEATURES = "ptest" - -require recipes-core/images/core-image-base.bb -require conf/include/ptest-packagelists-meta-oe.inc - -SUMMARY = "meta-oe ptest test image" - -DESCRIPTION += "Also including the ${MCNAME} ptest package." -HOMEPAGE = "https://www.openembedded.org/" - -PTESTS_META_OE = "${PTESTS_SLOW_META_OE} ${PTESTS_FAST_META_OE}" - -IMAGE_INSTALL:append = " ${MCNAME}-ptest openssh" - -BBCLASSEXTEND = "${@' '.join(['mcextend:'+x for x in d.getVar('PTESTS_META_OE').split()])}" - -# The image can be 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 up to 1500MB. -IMAGE_OVERHEAD_FACTOR = "1.0" -IMAGE_ROOTFS_EXTRA_SPACE = "324288" -# If a particular ptest needs more space, it can be customized: -#IMAGE_ROOTFS_EXTRA_SPACE:virtclass-mcextend- = "1024288" -IMAGE_ROOTFS_EXTRA_SPACE:virtclass-mcextend-poco = "1024288" - -# ptests need more memory than standard to avoid the OOM killer -QB_MEM = "-m 1024" -# If a particular ptest needs more memroy, it can be customized: -#QB_MEM:virtclass-mcextend- = "-m 4096" - -TEST_SUITES = "ping ssh parselogs ptest" - -# Sadly at the moment the full set of ptests is not robust enough and sporadically fails in random places -PTEST_EXPECT_FAILURE = "1" - -python () { - if not d.getVar("MCNAME"): - raise bb.parse.SkipRecipe("No class extension set") -} - diff --git a/meta-perl/recipes-core/images/meta-perl-image-ptest-all.bb b/meta-perl/recipes-core/images/meta-perl-image-ptest-all.bb new file mode 100644 index 0000000000..e2cafa98a5 --- /dev/null +++ b/meta-perl/recipes-core/images/meta-perl-image-ptest-all.bb @@ -0,0 +1,25 @@ +DESCRIPTION = "Recipe to trigger execution of all meta-perl ptest images." +HOMEPAGE = "https://www.openembedded.org/" + +LICENSE = "MIT" + +inherit features_check nopackages +REQUIRED_DISTRO_FEATURES = "ptest" + +require conf/include/ptest-packagelists-meta-perl.inc + +# Include the full set of ptests +PTESTS_META_PERL = "${PTESTS_FAST_META_PERL} ${PTESTS_SLOW_META_PERL}" + +do_testimage[noexec] = "1" +do_testimage[depends] = "${@' '.join(['meta-perl-image-ptest-'+x+':do_testimage' for x in d.getVar('PTESTS_META_PERL').split()])}" + +do_build[depends] = "${@' '.join(['meta-perl-image-ptest-'+x+':do_build' for x in d.getVar('PTESTS_META_PERL').split()])}" + +# normally image.bbclass would do this +EXCLUDE_FROM_WORLD = "1" + +python () { + if bb.utils.contains('IMAGE_CLASSES', 'testimage', True, False, d): + bb.build.addtask("do_testimage", "", "", d) +} diff --git a/meta-perl/recipes-core/images/meta-perl-image-ptest-fast.bb b/meta-perl/recipes-core/images/meta-perl-image-ptest-fast.bb new file mode 100644 index 0000000000..1ac78f30b7 --- /dev/null +++ b/meta-perl/recipes-core/images/meta-perl-image-ptest-fast.bb @@ -0,0 +1,6 @@ +require meta-perl-image-ptest-all.bb + +DESCRIPTION = "Recipe to trigger execution of all fast meta-perl ptest images." + +PTESTS_META_PERL = "${PTESTS_FAST_META_PERL}" + diff --git a/meta-perl/recipes-core/images/meta-perl-image-ptest.bb b/meta-perl/recipes-core/images/meta-perl-image-ptest.bb new file mode 100644 index 0000000000..d846717580 --- /dev/null +++ b/meta-perl/recipes-core/images/meta-perl-image-ptest.bb @@ -0,0 +1,40 @@ +inherit features_check +REQUIRED_DISTRO_FEATURES += "ptest" + +SUMMARY = "meta-perl build ptest image" + +require recipes-core/images/core-image-base.bb +require conf/include/ptest-packagelists-meta-perl.inc + +DESCRIPTION += "Also including the ${MCNAME} ptest package." +HOMEPAGE = "https://www.openembedded.org/" + +PTESTS_META_PERL = "${PTESTS_SLOW_META_PERL} ${PTESTS_FAST_META_PERL}" + +IMAGE_INSTALL:append = " ${MCNAME}-ptest openssh" + +BBCLASSEXTEND = "${@' '.join(['mcextend:'+x for x in d.getVar('PTESTS_META_PERL').split()])}" + +# The image can be 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 up to 1500MB. +IMAGE_OVERHEAD_FACTOR = "1.0" +IMAGE_ROOTFS_EXTRA_SPACE = "324288" +# If a particular ptest needs more space, it can be customized: +#IMAGE_ROOTFS_EXTRA_SPACE:virtclass-mcextend- = "1024288" + +# ptests need more memory than standard to avoid the OOM killer +QB_MEM = "-m 1024" +# If a particular ptest needs more memory, it can be customized: +#QB_MEM:virtclass-mcextend- = "-m 4096" + +TEST_SUITES = "ping ssh parselogs ptest" + +# Sadly at the moment the full set of ptests is not robust enough and sporadically fails in random places +PTEST_EXPECT_FAILURE = "1" + +python () { + if not d.getVar("MCNAME"): + raise bb.parse.SkipRecipe("No class extension set") +} + diff --git a/meta-perl/recipes-core/images/meta-perl-ptest-all-image.bb b/meta-perl/recipes-core/images/meta-perl-ptest-all-image.bb deleted file mode 100644 index 236043c22a..0000000000 --- a/meta-perl/recipes-core/images/meta-perl-ptest-all-image.bb +++ /dev/null @@ -1,25 +0,0 @@ -DESCRIPTION = "Recipe to trigger execution of all meta-perl ptest images." -HOMEPAGE = "https://www.openembedded.org/" - -LICENSE = "MIT" - -inherit features_check nopackages -REQUIRED_DISTRO_FEATURES = "ptest" - -require conf/include/ptest-packagelists-meta-perl.inc - -# Include the full set of ptests -PTESTS_META_PERL = "${PTESTS_FAST_META_PERL} ${PTESTS_SLOW_META_PERL}" - -do_testimage[noexec] = "1" -do_testimage[depends] = "${@' '.join(['meta-perl-ptest-image-'+x+':do_testimage' for x in d.getVar('PTESTS_META_PERL').split()])}" - -do_build[depends] = "${@' '.join(['meta-perl-ptest-image-'+x+':do_build' for x in d.getVar('PTESTS_META_PERL').split()])}" - -# normally image.bbclass would do this -EXCLUDE_FROM_WORLD = "1" - -python () { - if bb.utils.contains('IMAGE_CLASSES', 'testimage', True, False, d): - bb.build.addtask("do_testimage", "", "", d) -} diff --git a/meta-perl/recipes-core/images/meta-perl-ptest-fast-image.bb b/meta-perl/recipes-core/images/meta-perl-ptest-fast-image.bb deleted file mode 100644 index 5d8afa08e7..0000000000 --- a/meta-perl/recipes-core/images/meta-perl-ptest-fast-image.bb +++ /dev/null @@ -1,6 +0,0 @@ -require meta-perl-ptest-all-image.bb - -DESCRIPTION = "Recipe to trigger execution of all fast meta-perl ptest images." - -PTESTS_META_PERL = "${PTESTS_FAST_META_PERL}" - diff --git a/meta-perl/recipes-core/images/meta-perl-ptest-image.bb b/meta-perl/recipes-core/images/meta-perl-ptest-image.bb deleted file mode 100644 index d846717580..0000000000 --- a/meta-perl/recipes-core/images/meta-perl-ptest-image.bb +++ /dev/null @@ -1,40 +0,0 @@ -inherit features_check -REQUIRED_DISTRO_FEATURES += "ptest" - -SUMMARY = "meta-perl build ptest image" - -require recipes-core/images/core-image-base.bb -require conf/include/ptest-packagelists-meta-perl.inc - -DESCRIPTION += "Also including the ${MCNAME} ptest package." -HOMEPAGE = "https://www.openembedded.org/" - -PTESTS_META_PERL = "${PTESTS_SLOW_META_PERL} ${PTESTS_FAST_META_PERL}" - -IMAGE_INSTALL:append = " ${MCNAME}-ptest openssh" - -BBCLASSEXTEND = "${@' '.join(['mcextend:'+x for x in d.getVar('PTESTS_META_PERL').split()])}" - -# The image can be 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 up to 1500MB. -IMAGE_OVERHEAD_FACTOR = "1.0" -IMAGE_ROOTFS_EXTRA_SPACE = "324288" -# If a particular ptest needs more space, it can be customized: -#IMAGE_ROOTFS_EXTRA_SPACE:virtclass-mcextend- = "1024288" - -# ptests need more memory than standard to avoid the OOM killer -QB_MEM = "-m 1024" -# If a particular ptest needs more memory, it can be customized: -#QB_MEM:virtclass-mcextend- = "-m 4096" - -TEST_SUITES = "ping ssh parselogs ptest" - -# Sadly at the moment the full set of ptests is not robust enough and sporadically fails in random places -PTEST_EXPECT_FAILURE = "1" - -python () { - if not d.getVar("MCNAME"): - raise bb.parse.SkipRecipe("No class extension set") -} - diff --git a/meta-python/recipes-core/images/meta-python-image-ptest-all.bb b/meta-python/recipes-core/images/meta-python-image-ptest-all.bb new file mode 100644 index 0000000000..56c392f036 --- /dev/null +++ b/meta-python/recipes-core/images/meta-python-image-ptest-all.bb @@ -0,0 +1,25 @@ +DESCRIPTION = "Recipe to trigger execution of all meta-python ptest images." +HOMEPAGE = "https://www.openembedded.org/" + +LICENSE = "MIT" + +inherit features_check nopackages +REQUIRED_DISTRO_FEATURES = "ptest" + +require conf/include/ptest-packagelists-meta-python.inc + +# Include the full set of ptests +PTESTS_META_PYTHON = "${PTESTS_FAST_META_PYTHON} ${PTESTS_SLOW_META_PYTHON}" + +do_testimage[noexec] = "1" +do_testimage[depends] = "${@' '.join(['meta-python-image-ptest-'+x+':do_testimage' for x in d.getVar('PTESTS_META_PYTHON').split()])}" + +do_build[depends] = "${@' '.join(['meta-python-image-ptest-'+x+':do_build' for x in d.getVar('PTESTS_META_PYTHON').split()])}" + +# normally image.bbclass would do this +EXCLUDE_FROM_WORLD = "1" + +python () { + if bb.utils.contains('IMAGE_CLASSES', 'testimage', True, False, d): + bb.build.addtask("do_testimage", "", "", d) +} diff --git a/meta-python/recipes-core/images/meta-python-image-ptest-fast.bb b/meta-python/recipes-core/images/meta-python-image-ptest-fast.bb new file mode 100644 index 0000000000..bb6e8213fe --- /dev/null +++ b/meta-python/recipes-core/images/meta-python-image-ptest-fast.bb @@ -0,0 +1,6 @@ +require meta-python-image-ptest-all.bb + +DESCRIPTION = "Recipe to trigger execution of all fast meta-python ptest images." + +PTESTS_META_PYTHON = "${PTESTS_FAST_META_PYTHON}" + diff --git a/meta-python/recipes-core/images/meta-python-image-ptest.bb b/meta-python/recipes-core/images/meta-python-image-ptest.bb new file mode 100644 index 0000000000..f781322537 --- /dev/null +++ b/meta-python/recipes-core/images/meta-python-image-ptest.bb @@ -0,0 +1,40 @@ +inherit features_check +REQUIRED_DISTRO_FEATURES = "ptest" + +require recipes-core/images/core-image-base.bb +require conf/include/ptest-packagelists-meta-python.inc + +SUMMARY = "meta-python ptest test image" + +DESCRIPTION += "Also including the ${MCNAME} ptest package." +HOMEPAGE = "https://www.openembedded.org/" + +PTESTS_META_PYTHON = "${PTESTS_SLOW_META_PYTHON} ${PTESTS_FAST_META_PYTHON}" + +IMAGE_INSTALL:append = " ${MCNAME}-ptest openssh" + +BBCLASSEXTEND = "${@' '.join(['mcextend:'+x for x in d.getVar('PTESTS_META_PYTHON').split()])}" + +# The image can be 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 up to 1500MB. +IMAGE_OVERHEAD_FACTOR = "1.0" +IMAGE_ROOTFS_EXTRA_SPACE = "324288" +# If a particular ptest needs more space, it can be customized: +#IMAGE_ROOTFS_EXTRA_SPACE:virtclass-mcextend- = "1024288" + +# ptests need more memory than standard to avoid the OOM killer +QB_MEM = "-m 1024" +# If a particular ptest needs more memory, it can be customized: +#QB_MEM:virtclass-mcextend- = "-m 4096" + +TEST_SUITES = "ping ssh parselogs ptest" + +# Sadly at the moment the full set of ptests is not robust enough and sporadically fails in random places +PTEST_EXPECT_FAILURE = "1" + +python () { + if not d.getVar("MCNAME"): + raise bb.parse.SkipRecipe("No class extension set") +} + diff --git a/meta-python/recipes-core/images/meta-python-ptest-all-image.bb b/meta-python/recipes-core/images/meta-python-ptest-all-image.bb deleted file mode 100644 index fd4dc42487..0000000000 --- a/meta-python/recipes-core/images/meta-python-ptest-all-image.bb +++ /dev/null @@ -1,25 +0,0 @@ -DESCRIPTION = "Recipe to trigger execution of all meta-python ptest images." -HOMEPAGE = "https://www.openembedded.org/" - -LICENSE = "MIT" - -inherit features_check nopackages -REQUIRED_DISTRO_FEATURES = "ptest" - -require conf/include/ptest-packagelists-meta-python.inc - -# Include the full set of ptests -PTESTS_META_PYTHON = "${PTESTS_FAST_META_PYTHON} ${PTESTS_SLOW_META_PYTHON}" - -do_testimage[noexec] = "1" -do_testimage[depends] = "${@' '.join(['meta-python-ptest-image-'+x+':do_testimage' for x in d.getVar('PTESTS_META_PYTHON').split()])}" - -do_build[depends] = "${@' '.join(['meta-python-ptest-image-'+x+':do_build' for x in d.getVar('PTESTS_META_PYTHON').split()])}" - -# normally image.bbclass would do this -EXCLUDE_FROM_WORLD = "1" - -python () { - if bb.utils.contains('IMAGE_CLASSES', 'testimage', True, False, d): - bb.build.addtask("do_testimage", "", "", d) -} diff --git a/meta-python/recipes-core/images/meta-python-ptest-fast-image.bb b/meta-python/recipes-core/images/meta-python-ptest-fast-image.bb deleted file mode 100644 index 4f93a15959..0000000000 --- a/meta-python/recipes-core/images/meta-python-ptest-fast-image.bb +++ /dev/null @@ -1,6 +0,0 @@ -require meta-python-ptest-all-image.bb - -DESCRIPTION = "Recipe to trigger execution of all fast meta-python ptest images." - -PTESTS_META_PYTHON = "${PTESTS_FAST_META_PYTHON}" - diff --git a/meta-python/recipes-core/images/meta-python-ptest-image.bb b/meta-python/recipes-core/images/meta-python-ptest-image.bb deleted file mode 100644 index f781322537..0000000000 --- a/meta-python/recipes-core/images/meta-python-ptest-image.bb +++ /dev/null @@ -1,40 +0,0 @@ -inherit features_check -REQUIRED_DISTRO_FEATURES = "ptest" - -require recipes-core/images/core-image-base.bb -require conf/include/ptest-packagelists-meta-python.inc - -SUMMARY = "meta-python ptest test image" - -DESCRIPTION += "Also including the ${MCNAME} ptest package." -HOMEPAGE = "https://www.openembedded.org/" - -PTESTS_META_PYTHON = "${PTESTS_SLOW_META_PYTHON} ${PTESTS_FAST_META_PYTHON}" - -IMAGE_INSTALL:append = " ${MCNAME}-ptest openssh" - -BBCLASSEXTEND = "${@' '.join(['mcextend:'+x for x in d.getVar('PTESTS_META_PYTHON').split()])}" - -# The image can be 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 up to 1500MB. -IMAGE_OVERHEAD_FACTOR = "1.0" -IMAGE_ROOTFS_EXTRA_SPACE = "324288" -# If a particular ptest needs more space, it can be customized: -#IMAGE_ROOTFS_EXTRA_SPACE:virtclass-mcextend- = "1024288" - -# ptests need more memory than standard to avoid the OOM killer -QB_MEM = "-m 1024" -# If a particular ptest needs more memory, it can be customized: -#QB_MEM:virtclass-mcextend- = "-m 4096" - -TEST_SUITES = "ping ssh parselogs ptest" - -# Sadly at the moment the full set of ptests is not robust enough and sporadically fails in random places -PTEST_EXPECT_FAILURE = "1" - -python () { - if not d.getVar("MCNAME"): - raise bb.parse.SkipRecipe("No class extension set") -} - -- cgit v1.2.3-54-g00ecf