diff mbox series

[yocto-autobuilder-helper,2/2] config.json: add meta-oe to the metrics target

Message ID 20231031144957.648173-2-ross.burton@arm.com
State New
Headers show
Series [yocto-autobuilder-helper,1/2] Rewrite metrics-gathering scripts | expand

Commit Message

Ross Burton Oct. 31, 2023, 2:49 p.m. UTC
From: Ross Burton <ross.burton@arm.com>

This writes the metrics to a new yocto-metrics-meta-oe repository, and
write the results to patchmetrics-meta-oe.

There's a great/ugly (delete to taste) hack to hide CVEs from oe-core,
so this only lists issues in meta-oe.

Signed-off-by: Ross Burton <ross.burton@arm.com>
---
 config.json | 29 ++++++++++++++++++++++++-----
 1 file changed, 24 insertions(+), 5 deletions(-)

Comments

Yoann Congal Oct. 31, 2023, 3:01 p.m. UTC | #1
Le 31/10/2023 à 15:49, Ross Burton a écrit :
> From: Ross Burton <ross.burton@arm.com>
> 
> This writes the metrics to a new yocto-metrics-meta-oe repository, and
> write the results to patchmetrics-meta-oe.
> 
> There's a great/ugly (delete to taste) hack to hide CVEs from oe-core,
> so this only lists issues in meta-oe.
> 
> Signed-off-by: Ross Burton <ross.burton@arm.com>

Thanks Ross!
Reviewed-by: Yoann Congal <yoann.congal@smile.fr>
> ---
>  config.json | 29 ++++++++++++++++++++++++-----
>  1 file changed, 24 insertions(+), 5 deletions(-)
> 
> diff --git a/config.json b/config.json
> index f3a4ee7..1b3c2b0 100644
> --- a/config.json
> +++ b/config.json
> @@ -1198,7 +1198,7 @@
>              }
>          },
>          "metrics" : {
> -            "NEEDREPOS" : ["poky"],
> +            "NEEDREPOS" : ["poky", "meta-openembedded"],
>              "extravars" : [
>                  "INHERIT += 'cve-check'",
>                  "BB_DISKMON_DIRS = ''",
> @@ -1210,18 +1210,37 @@
>              "step1" : {
>                  "shortname" : "Fetching metrics repositories",
>                  "EXTRAPLAINCMDS" : [
> -                    "git clone ssh://git@push.yoctoproject.org/yocto-metrics"
> +                    "git clone ssh://git@push.yoctoproject.org/yocto-metrics && git clone ssh://git@push.yoctoproject.org/yocto-metrics-meta-oe"
>                  ]
>              },
>              "step2" : {
> -                "shortname" : "Generating patch metrics for Poky",
> +                "shortname" : "Patch metrics for meta",
>                  "EXTRACMDS" : ["${SCRIPTSDIR}/run-patchmetrics --poky ../ --metrics ../yocto-metrics --repo ../ --layer ../meta --branch ${HELPERBRANCHNAME} --results ${HELPERRESULTSDIR}/../../patchmetrics --push"]
>              },
>              "step3" : {
> -                "shortname" : "Running CVE checks for Poky",
> +                "shortname" : "CVE checks for meta",
>                  "EXTRACMDS" : ["${SCRIPTSDIR}/run-cvecheck --metrics ../yocto-metrics --branch ${HELPERBRANCHNAME} --results ${HELPERRESULTSDIR}/../../patchmetrics --push"]
> +            },
> +            "step4" : {
> +                "shortname" : "Patch metrics for meta-oe",
> +                "EXTRACMDS" : ["${SCRIPTSDIR}/run-patchmetrics --poky ../ --metrics ../yocto-metrics-meta-oe --repo ../meta-openembedded --layer ../meta-openembedded --branch ${HELPERBRANCHNAME} --results ${HELPERRESULTSDIR}/../../patchmetrics-meta-oe --push"]
> +            },
> +            "step5" : {
> +                "shortname" : "CVE checks for meta-oe",
> +                "ADDLAYER" : [
> +                    "${BUILDDIR}/../meta-openembedded/meta-oe",
> +                    "${BUILDDIR}/../meta-openembedded/meta-python",
> +                    "${BUILDDIR}/../meta-openembedded/meta-perl",
> +                    "${BUILDDIR}/../meta-openembedded/meta-networking",
> +                    "${BUILDDIR}/../meta-openembedded/meta-multimedia",
> +                    "${BUILDDIR}/../meta-openembedded/meta-gnome",
> +                    "${BUILDDIR}/../meta-openembedded/meta-xfce",
> +                    "${BUILDDIR}/../meta-openembedded/meta-filesystems",
> +                    "${BUILDDIR}/../meta-openembedded/meta-initramfs",
> +                    "${BUILDDIR}/../meta-openembedded/meta-webserver"
> +                    ],
> +                "EXTRACMDS" : ["echo 'do_cve_check:layer-core = \"\"' >> conf/auto.conf ; ${SCRIPTSDIR}/run-cvecheck --metrics ../yocto-metrics-meta-oe --branch ${HELPERBRANCHNAME} --results ${HELPERRESULTSDIR}/../../patchmetrics-meta-oe --push"]
>              }
> -
>          },
>          "meta-mingw" : {
>              "NEEDREPOS" : ["poky", "meta-mingw"],
> 
> 
> 
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#61533): https://lists.yoctoproject.org/g/yocto/message/61533
> Mute This Topic: https://lists.yoctoproject.org/mt/102298519/4316185
> Group Owner: yocto+owner@lists.yoctoproject.org
> Unsubscribe: https://lists.yoctoproject.org/g/yocto/leave/7785375/4316185/289819188/xyzzy [yoann.congal@smile.fr]
> -=-=-=-=-=-=-=-=-=-=-=-
>
diff mbox series

Patch

diff --git a/config.json b/config.json
index f3a4ee7..1b3c2b0 100644
--- a/config.json
+++ b/config.json
@@ -1198,7 +1198,7 @@ 
             }
         },
         "metrics" : {
-            "NEEDREPOS" : ["poky"],
+            "NEEDREPOS" : ["poky", "meta-openembedded"],
             "extravars" : [
                 "INHERIT += 'cve-check'",
                 "BB_DISKMON_DIRS = ''",
@@ -1210,18 +1210,37 @@ 
             "step1" : {
                 "shortname" : "Fetching metrics repositories",
                 "EXTRAPLAINCMDS" : [
-                    "git clone ssh://git@push.yoctoproject.org/yocto-metrics"
+                    "git clone ssh://git@push.yoctoproject.org/yocto-metrics && git clone ssh://git@push.yoctoproject.org/yocto-metrics-meta-oe"
                 ]
             },
             "step2" : {
-                "shortname" : "Generating patch metrics for Poky",
+                "shortname" : "Patch metrics for meta",
                 "EXTRACMDS" : ["${SCRIPTSDIR}/run-patchmetrics --poky ../ --metrics ../yocto-metrics --repo ../ --layer ../meta --branch ${HELPERBRANCHNAME} --results ${HELPERRESULTSDIR}/../../patchmetrics --push"]
             },
             "step3" : {
-                "shortname" : "Running CVE checks for Poky",
+                "shortname" : "CVE checks for meta",
                 "EXTRACMDS" : ["${SCRIPTSDIR}/run-cvecheck --metrics ../yocto-metrics --branch ${HELPERBRANCHNAME} --results ${HELPERRESULTSDIR}/../../patchmetrics --push"]
+            },
+            "step4" : {
+                "shortname" : "Patch metrics for meta-oe",
+                "EXTRACMDS" : ["${SCRIPTSDIR}/run-patchmetrics --poky ../ --metrics ../yocto-metrics-meta-oe --repo ../meta-openembedded --layer ../meta-openembedded --branch ${HELPERBRANCHNAME} --results ${HELPERRESULTSDIR}/../../patchmetrics-meta-oe --push"]
+            },
+            "step5" : {
+                "shortname" : "CVE checks for meta-oe",
+                "ADDLAYER" : [
+                    "${BUILDDIR}/../meta-openembedded/meta-oe",
+                    "${BUILDDIR}/../meta-openembedded/meta-python",
+                    "${BUILDDIR}/../meta-openembedded/meta-perl",
+                    "${BUILDDIR}/../meta-openembedded/meta-networking",
+                    "${BUILDDIR}/../meta-openembedded/meta-multimedia",
+                    "${BUILDDIR}/../meta-openembedded/meta-gnome",
+                    "${BUILDDIR}/../meta-openembedded/meta-xfce",
+                    "${BUILDDIR}/../meta-openembedded/meta-filesystems",
+                    "${BUILDDIR}/../meta-openembedded/meta-initramfs",
+                    "${BUILDDIR}/../meta-openembedded/meta-webserver"
+                    ],
+                "EXTRACMDS" : ["echo 'do_cve_check:layer-core = \"\"' >> conf/auto.conf ; ${SCRIPTSDIR}/run-cvecheck --metrics ../yocto-metrics-meta-oe --branch ${HELPERBRANCHNAME} --results ${HELPERRESULTSDIR}/../../patchmetrics-meta-oe --push"]
             }
-
         },
         "meta-mingw" : {
             "NEEDREPOS" : ["poky", "meta-mingw"],