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

--

Commit: https://gitlab.com/SECO-Northern-Europe/yocto/infrastructure/gitlab-ci/-/commit/3f293145ca987e3ea3bfb7b1530485167d011a77

CI: merge_gitlab_ci: Fix for merge.

.gitlab-ci @ 3f293145

-Subproject commit 2aeb899ae3a3ad32ccac3b15f7025d42de5d5dac
+Subproject commit 3f293145ca987e3ea3bfb7b1530485167d011a77

.gitlab-ci.yml

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