From 9155ea6fb3e70f5c2ffbc7b8e566a8e6522f9bfd Mon Sep 17 00:00:00 2001
From: gitbot <gitbot.north@seco.com>
Date: Thu, 17 Oct 2024 13:29:52 +0000
Subject: [PATCH] Integrate gitlab-ci/update-container-images and 2 more
--
Commit: https://git.seco.com/clea-os/infrastructure/gitlab-ci/-/commit/12d0d7d2f9a3fc8d01184c4435cb465b0762133b
[DOCKER] Hardcode the tag for clea-os-builder Docker image
It follows the different tagging scheme, so might break if we
change the CI_IMAGES_REV for images from gitlab registry
--
Commit: https://git.seco.com/clea-os/infrastructure/gitlab-ci/-/commit/ca1a2d56a8e5920910b1a08d9a41d59b65ed0423
[DOCKER] Add variable for LAVA an Exein Docker images
--
Commit: https://git.seco.com/clea-os/infrastructure/gitlab-ci/-/commit/91fe9a6d7dc7d70ab9641f299f3dbfe836bff16d
[DOCKER] Adopt new Docker images url scheme
---
.gitlab-ci | 2 +-
.gitlab-ci.yml | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/.gitlab-ci b/.gitlab-ci
index d6cac3d..12d0d7d 160000
--- a/.gitlab-ci
+++ b/.gitlab-ci
@@ -1 +1 @@
-Subproject commit d6cac3d185f7758f2ae87c893f7add541afb7659
+Subproject commit 12d0d7d2f9a3fc8d01184c4435cb465b0762133b
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 27ce2e9..866d4fc 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -4,11 +4,11 @@
# ---------------------------------------------------------------------------------------
include:
- project: '${CI_PROJECT_ROOT_NAMESPACE}/infrastructure/gitlab-ci'
- ref: d6cac3d185f7758f2ae87c893f7add541afb7659
+ ref: 12d0d7d2f9a3fc8d01184c4435cb465b0762133b
file: 'layers-integration.yml'
variables:
- GITLAB_CI_REVISION: d6cac3d185f7758f2ae87c893f7add541afb7659
+ GITLAB_CI_REVISION: 12d0d7d2f9a3fc8d01184c4435cb465b0762133b
# FIXME: This is only necessary due to the following GitLab limitation:
# https://gitlab.com/gitlab-org/gitlab/-/issues/209904
# As soon as this gets fixed upstream, the hard-coded branch name should be removed.
--
GitLab