[v1,1/5] Use full registry path for the CrOS docker
diff mbox series

Message ID 20240307221810.2109348-2-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>

This is not built by the pipeline and won't be found in the users
namespace.

Signed-off-by: Nicolas Dufresne <nicolas.dufresne@collabora.com>
---
 gitlab-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Kieran Bingham March 7, 2024, 10:33 p.m. UTC | #1 
Quoting Nicolas Dufresne (2024-03-07 22:18:06)
> From: Nicolas Dufresne <nicolas.dufresne@collabora.com>
> 
> This is not built by the pipeline and won't be found in the users
> namespace.

As long as this doesn't cause large rebuilds for every fork. But I think
this would already fix the libcamera-softisp fork builds.


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

> 
> Signed-off-by: Nicolas Dufresne <nicolas.dufresne@collabora.com>
> ---
>  gitlab-ci.yml | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/gitlab-ci.yml b/gitlab-ci.yml
> index 81ab8c4..a4e1ef4 100644
> --- a/gitlab-ci.yml
> +++ b/gitlab-ci.yml
> @@ -7,7 +7,7 @@ stages:
>    - test
>  
>  variables:
> -  CROS_SDK_IMAGE: '${CI_REGISTRY_IMAGE}/cros-sdk-lite-r120-15662:2024-01-16.0'
> +  CROS_SDK_IMAGE: 'registry.freedesktop.org/camera/libcamera/cros-sdk-lite-r120-15662:2024-01-16.0'
>    GIT_DEPTH: 1
>    KERNEL_VERSION: '6.6'
>    MESON_ALL_OPTIONS: >-
> -- 
> 2.43.2
>

Patch
diff mbox series 

diff --git a/gitlab-ci.yml b/gitlab-ci.yml
index 81ab8c4..a4e1ef4 100644
--- a/gitlab-ci.yml
+++ b/gitlab-ci.yml
@@ -7,7 +7,7 @@  stages:
   - test
 
 variables:
-  CROS_SDK_IMAGE: '${CI_REGISTRY_IMAGE}/cros-sdk-lite-r120-15662:2024-01-16.0'
+  CROS_SDK_IMAGE: 'registry.freedesktop.org/camera/libcamera/cros-sdk-lite-r120-15662:2024-01-16.0'
   GIT_DEPTH: 1
   KERNEL_VERSION: '6.6'
   MESON_ALL_OPTIONS: >-