[libcamera-ci,v1] Eliminate duplicate keys in YAML
diff mbox series

Message ID 20241218124555.330740-1-barnabas.pocze@ideasonboard.com
State Accepted
Headers show
Series
  • [libcamera-ci,v1] Eliminate duplicate keys in YAML
Related show

Commit Message

Barnabás Pőcze Dec. 18, 2024, 12:45 p.m. UTC
The key `artifacts` occurs twice in the `test-unit` dictionary.
Gitlab accepts this, but as if only the second occurrence was
present, so the meson logs are not saved as artifacts. Merge
the two artifact specifications to fix this.

Fixes: 075d5a5cd22ecd ("Enable junit artifact generation for test-unit job")
Signed-off-by: Barnabás Pőcze <barnabas.pocze@ideasonboard.com>
---
 gitlab-ci.yml | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

--
2.47.1

Comments

Laurent Pinchart Dec. 19, 2024, 1:51 a.m. UTC | #1
Hi Barnabás,

Thank you for the patch.

On Wed, Dec 18, 2024 at 01:45:55PM +0100, Barnabás Pőcze wrote:
> The key `artifacts` occurs twice in the `test-unit` dictionary.
> Gitlab accepts this, but as if only the second occurrence was
> present, so the meson logs are not saved as artifacts. Merge
> the two artifact specifications to fix this.
> 
> Fixes: 075d5a5cd22ecd ("Enable junit artifact generation for test-unit job")
> Signed-off-by: Barnabás Pőcze <barnabas.pocze@ideasonboard.com>

Oops.

Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>

> ---
>  gitlab-ci.yml | 5 ++---
>  1 file changed, 2 insertions(+), 3 deletions(-)
> 
> diff --git a/gitlab-ci.yml b/gitlab-ci.yml
> index ec19f55..48c18d5 100644
> --- a/gitlab-ci.yml
> +++ b/gitlab-ci.yml
> @@ -394,6 +394,8 @@ test-unit:
>      expire_in: 1 week
>      paths:
>        - build/meson-logs/
> +    reports:
> +      junit: build/meson-logs/testlog.junit.xml
>    variables:
>      BUILD_TYPE: debug
>      MESON_OPTIONS: >-
> @@ -408,9 +410,6 @@ test-unit:
>        -D qcam=disabled
>        -D test=true
>        -D v4l2=true
> -  artifacts:
> -    reports:
> -      junit: build/meson-logs/testlog.junit.xml
> 
>  test-lc-compliance:virtual:
>    extends:

Patch
diff mbox series

diff --git a/gitlab-ci.yml b/gitlab-ci.yml
index ec19f55..48c18d5 100644
--- a/gitlab-ci.yml
+++ b/gitlab-ci.yml
@@ -394,6 +394,8 @@  test-unit:
     expire_in: 1 week
     paths:
       - build/meson-logs/
+    reports:
+      junit: build/meson-logs/testlog.junit.xml
   variables:
     BUILD_TYPE: debug
     MESON_OPTIONS: >-
@@ -408,9 +410,6 @@  test-unit:
       -D qcam=disabled
       -D test=true
       -D v4l2=true
-  artifacts:
-    reports:
-      junit: build/meson-logs/testlog.junit.xml

 test-lc-compliance:virtual:
   extends: