[v1,4/5] docker: Install appsink element
diff mbox series

Message ID 20240307221810.2109348-5-nicolas@ndufresne.ca
State Accepted
Headers show
Series
  • Fix various CI issues
Related show

Commit Message

Nicolas Dufresne March 7, 2024, 10:18 p.m. UTC
From: Nicolas Dufresne <nicolas.dufresne@collabora.com>

Some new tests required appsink element. Install the required package.

Signed-off-by: Nicolas Dufresne <nicolas.dufresne@collabora.com>
---
 .gitlab-ci/setup-container.sh | 1 +
 gitlab-ci.yml                 | 6 +++---
 2 files changed, 4 insertions(+), 3 deletions(-)

Comments

Kieran Bingham March 7, 2024, 10:36 p.m. UTC | #1
Quoting Nicolas Dufresne (2024-03-07 22:18:09)
> From: Nicolas Dufresne <nicolas.dufresne@collabora.com>
> 
> Some new tests required appsink element. Install the required package.
> 
> Signed-off-by: Nicolas Dufresne <nicolas.dufresne@collabora.com>
> ---
>  .gitlab-ci/setup-container.sh | 1 +
>  gitlab-ci.yml                 | 6 +++---
>  2 files changed, 4 insertions(+), 3 deletions(-)
> 
> diff --git a/.gitlab-ci/setup-container.sh b/.gitlab-ci/setup-container.sh
> index 6027433..29cdd2a 100755
> --- a/.gitlab-ci/setup-container.sh
> +++ b/.gitlab-ci/setup-container.sh
> @@ -55,6 +55,7 @@ PKGS_LIBCAMERA_RUNTIME=(
>  )
>  
>  PKGS_LIBCAMERA_RUNTIME_MULTIARCH=(
> +       gstreamer1.0-plugins-base
>         libdrm-dev
>         libdw-dev
>         libexif-dev
> diff --git a/gitlab-ci.yml b/gitlab-ci.yml
> index 105971d..8f455da 100644
> --- a/gitlab-ci.yml
> +++ b/gitlab-ci.yml
> @@ -53,17 +53,17 @@ include:
>  .libcamera-ci.debian:10:
>    variables:
>      FDO_DISTRIBUTION_VERSION: 'buster'
> -    FDO_DISTRIBUTION_TAG: '2024-01-09.2'
> +    FDO_DISTRIBUTION_TAG: '2024-04-07.3'
>  
>  .libcamera-ci.debian:12:
>    variables:
>      FDO_DISTRIBUTION_VERSION: 'bookworm'
> -    FDO_DISTRIBUTION_TAG: '2024-01-09.1'
> +    FDO_DISTRIBUTION_TAG: '2024-04-07.3'
>  
>  .libcamera-ci.debian:13:
>    variables:
>      FDO_DISTRIBUTION_VERSION: 'trixie'
> -    FDO_DISTRIBUTION_TAG: '2024-01-09.0'
> +    FDO_DISTRIBUTION_TAG: '2024-04-07.3'

These were previously .0, .1, .2, and now they're all .3. What's the
significance of that ? Any potential issues? Is this just bumping the
tag to make sure the image gets rebuilt fully?



>  
>  .container-debian:
>    extends:
> -- 
> 2.43.2
>
Kieran Bingham March 7, 2024, 10:51 p.m. UTC | #2
Quoting Kieran Bingham (2024-03-07 22:36:15)
> Quoting Nicolas Dufresne (2024-03-07 22:18:09)
> > From: Nicolas Dufresne <nicolas.dufresne@collabora.com>
> > 
> > Some new tests required appsink element. Install the required package.
> > 
> > Signed-off-by: Nicolas Dufresne <nicolas.dufresne@collabora.com>
> > ---
> >  .gitlab-ci/setup-container.sh | 1 +
> >  gitlab-ci.yml                 | 6 +++---
> >  2 files changed, 4 insertions(+), 3 deletions(-)
> > 
> > diff --git a/.gitlab-ci/setup-container.sh b/.gitlab-ci/setup-container.sh
> > index 6027433..29cdd2a 100755
> > --- a/.gitlab-ci/setup-container.sh
> > +++ b/.gitlab-ci/setup-container.sh
> > @@ -55,6 +55,7 @@ PKGS_LIBCAMERA_RUNTIME=(
> >  )
> >  
> >  PKGS_LIBCAMERA_RUNTIME_MULTIARCH=(
> > +       gstreamer1.0-plugins-base
> >         libdrm-dev
> >         libdw-dev
> >         libexif-dev
> > diff --git a/gitlab-ci.yml b/gitlab-ci.yml
> > index 105971d..8f455da 100644
> > --- a/gitlab-ci.yml
> > +++ b/gitlab-ci.yml
> > @@ -53,17 +53,17 @@ include:
> >  .libcamera-ci.debian:10:
> >    variables:
> >      FDO_DISTRIBUTION_VERSION: 'buster'
> > -    FDO_DISTRIBUTION_TAG: '2024-01-09.2'
> > +    FDO_DISTRIBUTION_TAG: '2024-04-07.3'
> >  
> >  .libcamera-ci.debian:12:
> >    variables:
> >      FDO_DISTRIBUTION_VERSION: 'bookworm'
> > -    FDO_DISTRIBUTION_TAG: '2024-01-09.1'
> > +    FDO_DISTRIBUTION_TAG: '2024-04-07.3'
> >  
> >  .libcamera-ci.debian:13:
> >    variables:
> >      FDO_DISTRIBUTION_VERSION: 'trixie'
> > -    FDO_DISTRIBUTION_TAG: '2024-01-09.0'
> > +    FDO_DISTRIBUTION_TAG: '2024-04-07.3'
> 
> These were previously .0, .1, .2, and now they're all .3. What's the
> significance of that ? Any potential issues? Is this just bumping the
> tag to make sure the image gets rebuilt fully?
> 

As I understand these are just tags to track the build idnetifier, so
updating these will trigger the rebuild against the new package
additions so:


Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com>

> 
> >  
> >  .container-debian:
> >    extends:
> > -- 
> > 2.43.2
> >
Laurent Pinchart April 18, 2024, 9:32 a.m. UTC | #3
On Thu, Mar 07, 2024 at 10:51:15PM +0000, Kieran Bingham wrote:
> Quoting Kieran Bingham (2024-03-07 22:36:15)
> > Quoting Nicolas Dufresne (2024-03-07 22:18:09)
> > > From: Nicolas Dufresne <nicolas.dufresne@collabora.com>
> > > 
> > > Some new tests required appsink element. Install the required package.
> > > 
> > > Signed-off-by: Nicolas Dufresne <nicolas.dufresne@collabora.com>
> > > ---
> > >  .gitlab-ci/setup-container.sh | 1 +
> > >  gitlab-ci.yml                 | 6 +++---
> > >  2 files changed, 4 insertions(+), 3 deletions(-)
> > > 
> > > diff --git a/.gitlab-ci/setup-container.sh b/.gitlab-ci/setup-container.sh
> > > index 6027433..29cdd2a 100755
> > > --- a/.gitlab-ci/setup-container.sh
> > > +++ b/.gitlab-ci/setup-container.sh
> > > @@ -55,6 +55,7 @@ PKGS_LIBCAMERA_RUNTIME=(
> > >  )
> > >  
> > >  PKGS_LIBCAMERA_RUNTIME_MULTIARCH=(
> > > +       gstreamer1.0-plugins-base
> > >         libdrm-dev
> > >         libdw-dev
> > >         libexif-dev
> > > diff --git a/gitlab-ci.yml b/gitlab-ci.yml
> > > index 105971d..8f455da 100644
> > > --- a/gitlab-ci.yml
> > > +++ b/gitlab-ci.yml
> > > @@ -53,17 +53,17 @@ include:
> > >  .libcamera-ci.debian:10:
> > >    variables:
> > >      FDO_DISTRIBUTION_VERSION: 'buster'
> > > -    FDO_DISTRIBUTION_TAG: '2024-01-09.2'
> > > +    FDO_DISTRIBUTION_TAG: '2024-04-07.3'
> > >  
> > >  .libcamera-ci.debian:12:
> > >    variables:
> > >      FDO_DISTRIBUTION_VERSION: 'bookworm'
> > > -    FDO_DISTRIBUTION_TAG: '2024-01-09.1'
> > > +    FDO_DISTRIBUTION_TAG: '2024-04-07.3'
> > >  
> > >  .libcamera-ci.debian:13:
> > >    variables:
> > >      FDO_DISTRIBUTION_VERSION: 'trixie'
> > > -    FDO_DISTRIBUTION_TAG: '2024-01-09.0'
> > > +    FDO_DISTRIBUTION_TAG: '2024-04-07.3'
> > 
> > These were previously .0, .1, .2, and now they're all .3. What's the
> > significance of that ? Any potential issues? Is this just bumping the
> > tag to make sure the image gets rebuilt fully?
> > 
> 
> As I understand these are just tags to track the build idnetifier, so
> updating these will trigger the rebuild against the new package
> additions so:

The .x suffix is meant to support creating multiple images per day. They
should have been set to .0 here. It's nothing that requires fixing, but
new updates to this file shouldn't use .4.

> Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
> 
> > >  
> > >  .container-debian:
> > >    extends:
Nicolas Dufresne April 23, 2024, 6:16 p.m. UTC | #4
Late reply ...

Le jeudi 18 avril 2024 à 12:32 +0300, Laurent Pinchart a écrit :
> On Thu, Mar 07, 2024 at 10:51:15PM +0000, Kieran Bingham wrote:
> > Quoting Kieran Bingham (2024-03-07 22:36:15)
> > > Quoting Nicolas Dufresne (2024-03-07 22:18:09)
> > > > From: Nicolas Dufresne <nicolas.dufresne@collabora.com>
> > > > 
> > > > Some new tests required appsink element. Install the required package.
> > > > 
> > > > Signed-off-by: Nicolas Dufresne <nicolas.dufresne@collabora.com>
> > > > ---
> > > >  .gitlab-ci/setup-container.sh | 1 +
> > > >  gitlab-ci.yml                 | 6 +++---
> > > >  2 files changed, 4 insertions(+), 3 deletions(-)
> > > > 
> > > > diff --git a/.gitlab-ci/setup-container.sh b/.gitlab-ci/setup-container.sh
> > > > index 6027433..29cdd2a 100755
> > > > --- a/.gitlab-ci/setup-container.sh
> > > > +++ b/.gitlab-ci/setup-container.sh
> > > > @@ -55,6 +55,7 @@ PKGS_LIBCAMERA_RUNTIME=(
> > > >  )
> > > >  
> > > >  PKGS_LIBCAMERA_RUNTIME_MULTIARCH=(
> > > > +       gstreamer1.0-plugins-base
> > > >         libdrm-dev
> > > >         libdw-dev
> > > >         libexif-dev
> > > > diff --git a/gitlab-ci.yml b/gitlab-ci.yml
> > > > index 105971d..8f455da 100644
> > > > --- a/gitlab-ci.yml
> > > > +++ b/gitlab-ci.yml
> > > > @@ -53,17 +53,17 @@ include:
> > > >  .libcamera-ci.debian:10:
> > > >    variables:
> > > >      FDO_DISTRIBUTION_VERSION: 'buster'
> > > > -    FDO_DISTRIBUTION_TAG: '2024-01-09.2'
> > > > +    FDO_DISTRIBUTION_TAG: '2024-04-07.3'
> > > >  
> > > >  .libcamera-ci.debian:12:
> > > >    variables:
> > > >      FDO_DISTRIBUTION_VERSION: 'bookworm'
> > > > -    FDO_DISTRIBUTION_TAG: '2024-01-09.1'
> > > > +    FDO_DISTRIBUTION_TAG: '2024-04-07.3'
> > > >  
> > > >  .libcamera-ci.debian:13:
> > > >    variables:
> > > >      FDO_DISTRIBUTION_VERSION: 'trixie'
> > > > -    FDO_DISTRIBUTION_TAG: '2024-01-09.0'
> > > > +    FDO_DISTRIBUTION_TAG: '2024-04-07.3'
> > > 
> > > These were previously .0, .1, .2, and now they're all .3. What's the
> > > significance of that ? Any potential issues? Is this just bumping the
> > > tag to make sure the image gets rebuilt fully?
> > > 
> > 
> > As I understand these are just tags to track the build idnetifier, so
> > updating these will trigger the rebuild against the new package
> > additions so:
> 
> The .x suffix is meant to support creating multiple images per day. They
> should have been set to .0 here. It's nothing that requires fixing, but
> new updates to this file shouldn't use .4.

The commit is totally accurate, the day I submitted this I needed 3 iterations
to get it right. Resetting back to 0 that day would have clashed with my
registry forcing me to manually remove the old images.

https://gitlab.freedesktop.org/ndufresne/libcamera/container_registry/48986

Please let non-maintainer submitter use this pattern so no one endup having to
deal with conflicting docker image and random issues.

regards,
Nicolas
Laurent Pinchart April 24, 2024, 7:59 a.m. UTC | #5
Hi Nicolas,

On Tue, Apr 23, 2024 at 02:16:25PM -0400, Nicolas Dufresne wrote:
> Late reply ...
> 
> Le jeudi 18 avril 2024 à 12:32 +0300, Laurent Pinchart a écrit :
> > On Thu, Mar 07, 2024 at 10:51:15PM +0000, Kieran Bingham wrote:
> > > Quoting Kieran Bingham (2024-03-07 22:36:15)
> > > > Quoting Nicolas Dufresne (2024-03-07 22:18:09)
> > > > > From: Nicolas Dufresne <nicolas.dufresne@collabora.com>
> > > > > 
> > > > > Some new tests required appsink element. Install the required package.
> > > > > 
> > > > > Signed-off-by: Nicolas Dufresne <nicolas.dufresne@collabora.com>
> > > > > ---
> > > > >  .gitlab-ci/setup-container.sh | 1 +
> > > > >  gitlab-ci.yml                 | 6 +++---
> > > > >  2 files changed, 4 insertions(+), 3 deletions(-)
> > > > > 
> > > > > diff --git a/.gitlab-ci/setup-container.sh b/.gitlab-ci/setup-container.sh
> > > > > index 6027433..29cdd2a 100755
> > > > > --- a/.gitlab-ci/setup-container.sh
> > > > > +++ b/.gitlab-ci/setup-container.sh
> > > > > @@ -55,6 +55,7 @@ PKGS_LIBCAMERA_RUNTIME=(
> > > > >  )
> > > > >  
> > > > >  PKGS_LIBCAMERA_RUNTIME_MULTIARCH=(
> > > > > +       gstreamer1.0-plugins-base
> > > > >         libdrm-dev
> > > > >         libdw-dev
> > > > >         libexif-dev
> > > > > diff --git a/gitlab-ci.yml b/gitlab-ci.yml
> > > > > index 105971d..8f455da 100644
> > > > > --- a/gitlab-ci.yml
> > > > > +++ b/gitlab-ci.yml
> > > > > @@ -53,17 +53,17 @@ include:
> > > > >  .libcamera-ci.debian:10:
> > > > >    variables:
> > > > >      FDO_DISTRIBUTION_VERSION: 'buster'
> > > > > -    FDO_DISTRIBUTION_TAG: '2024-01-09.2'
> > > > > +    FDO_DISTRIBUTION_TAG: '2024-04-07.3'
> > > > >  
> > > > >  .libcamera-ci.debian:12:
> > > > >    variables:
> > > > >      FDO_DISTRIBUTION_VERSION: 'bookworm'
> > > > > -    FDO_DISTRIBUTION_TAG: '2024-01-09.1'
> > > > > +    FDO_DISTRIBUTION_TAG: '2024-04-07.3'
> > > > >  
> > > > >  .libcamera-ci.debian:13:
> > > > >    variables:
> > > > >      FDO_DISTRIBUTION_VERSION: 'trixie'
> > > > > -    FDO_DISTRIBUTION_TAG: '2024-01-09.0'
> > > > > +    FDO_DISTRIBUTION_TAG: '2024-04-07.3'
> > > > 
> > > > These were previously .0, .1, .2, and now they're all .3. What's the
> > > > significance of that ? Any potential issues? Is this just bumping the
> > > > tag to make sure the image gets rebuilt fully?
> > > > 
> > > 
> > > As I understand these are just tags to track the build idnetifier, so
> > > updating these will trigger the rebuild against the new package
> > > additions so:
> > 
> > The .x suffix is meant to support creating multiple images per day. They
> > should have been set to .0 here. It's nothing that requires fixing, but
> > new updates to this file shouldn't use .4.
> 
> The commit is totally accurate, the day I submitted this I needed 3 iterations
> to get it right.

Ah, I hand't realized that.

> Resetting back to 0 that day would have clashed with my
> registry forcing me to manually remove the old images.
> 
> https://gitlab.freedesktop.org/ndufresne/libcamera/container_registry/48986
> 
> Please let non-maintainer submitter use this pattern so no one endup having to
> deal with conflicting docker image and random issues.

Sure.

Patch
diff mbox series

diff --git a/.gitlab-ci/setup-container.sh b/.gitlab-ci/setup-container.sh
index 6027433..29cdd2a 100755
--- a/.gitlab-ci/setup-container.sh
+++ b/.gitlab-ci/setup-container.sh
@@ -55,6 +55,7 @@  PKGS_LIBCAMERA_RUNTIME=(
 )
 
 PKGS_LIBCAMERA_RUNTIME_MULTIARCH=(
+	gstreamer1.0-plugins-base
 	libdrm-dev
 	libdw-dev
 	libexif-dev
diff --git a/gitlab-ci.yml b/gitlab-ci.yml
index 105971d..8f455da 100644
--- a/gitlab-ci.yml
+++ b/gitlab-ci.yml
@@ -53,17 +53,17 @@  include:
 .libcamera-ci.debian:10:
   variables:
     FDO_DISTRIBUTION_VERSION: 'buster'
-    FDO_DISTRIBUTION_TAG: '2024-01-09.2'
+    FDO_DISTRIBUTION_TAG: '2024-04-07.3'
 
 .libcamera-ci.debian:12:
   variables:
     FDO_DISTRIBUTION_VERSION: 'bookworm'
-    FDO_DISTRIBUTION_TAG: '2024-01-09.1'
+    FDO_DISTRIBUTION_TAG: '2024-04-07.3'
 
 .libcamera-ci.debian:13:
   variables:
     FDO_DISTRIBUTION_VERSION: 'trixie'
-    FDO_DISTRIBUTION_TAG: '2024-01-09.0'
+    FDO_DISTRIBUTION_TAG: '2024-04-07.3'
 
 .container-debian:
   extends: