From d90da4691a4f999a00b5653d264bb7e879c6c0cb Mon Sep 17 00:00:00 2001 From: gitbot <gitbot@garz-fricke.com> Date: Mon, 9 Jan 2023 13:20:32 +0000 Subject: [PATCH] Integrate gitlab-ci/remove-dynamic-job-generation -- Commit: https://git.seco.com/seco-ne/yocto/infrastructure/gitlab-ci/-/commit/897ba05909d14939c1e044de8f71b95f0074534f Manifest integration: remove dynamic job generation The dynamic job was only necessary because GitLab did not expand variables in the "trigger:project" keyword: https://gitlab.com/gitlab-org/gitlab/-/issues/347469 This has been fixed in GitLab 15.3, so we don't need it anymore: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/92346 --- .gitlab-ci | 2 +- .gitlab-ci.yml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci b/.gitlab-ci index ea1f3badfbab2..897ba05909d14 160000 --- a/.gitlab-ci +++ b/.gitlab-ci @@ -1 +1 @@ -Subproject commit ea1f3badfbab2167640774e38310c9251ada488b +Subproject commit 897ba05909d14939c1e044de8f71b95f0074534f diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index d40a2e00a22ce..0558be37664f1 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -4,11 +4,11 @@ # --------------------------------------------------------------------------------------- include: - project: '${CI_PROJECT_ROOT_NAMESPACE}/yocto/infrastructure/gitlab-ci' - ref: ea1f3badfbab2167640774e38310c9251ada488b + ref: 897ba05909d14939c1e044de8f71b95f0074534f file: 'manifest-integration.yml' variables: - GITLAB_CI_REVISION: ea1f3badfbab2167640774e38310c9251ada488b + GITLAB_CI_REVISION: 897ba05909d14939c1e044de8f71b95f0074534f BB_RECIPE_NAME: linux-seconorth # FIXME: This is only necessary due to the following GitLab limitation: # https://gitlab.com/gitlab-org/gitlab/-/issues/209904 -- GitLab