Integrate gitlab-ci/CI-gitlab-ci-merge-after-merge-fixes

--

Commit: https://gitlab.com/SECO-Northern-Europe/yocto/infrastructure/gitlab-ci/-/commit/2aeb899ae3a3ad32ccac3b15f7025d42de5d5dac

CI: merge_gitlab_ci: Fix some post merge issues

.gitlab-ci @ 2aeb899a

-Subproject commit 7381d5983371f0bedd89d6c40db6c600932909e6
+Subproject commit 2aeb899ae3a3ad32ccac3b15f7025d42de5d5dac

.gitlab-ci.yml

@@ -4,7 +4,7 @@
 # ---------------------------------------------------------------------------------------
 include:
   - project: '${CI_PROJECT_ROOT_NAMESPACE}/yocto/infrastructure/gitlab-ci'
-    ref: 7381d5983371f0bedd89d6c40db6c600932909e6
+    ref: 2aeb899ae3a3ad32ccac3b15f7025d42de5d5dac
     file: 'manifest-integration.yml'
 
 variables: