From a8826b6d7038fda3cf2c70d228ec1e8d256cf91c Mon Sep 17 00:00:00 2001 From: gitbot <gitbot.north@seco.com> Date: Tue, 23 Jul 2024 07:46:53 +0000 Subject: [PATCH] Integrate gitlab-ci/yt-157-backup-solution-for-gitlab and 1 more -- Commit: https://git.seco.com/seco-ne/yocto/infrastructure/gitlab-ci/-/commit/83f4f6105c29cecfb6d636b6cfea6c8f5214a54b Take group path from group instead of options -- Commit: https://git.seco.com/seco-ne/yocto/infrastructure/gitlab-ci/-/commit/93eabeb3afbfb5cb094459b1c510a6a74cd542a4 YT-157 Adjust GitLab Backup Script to avoid shared projects Ensure backups are only processed for direct member projects of a group. If a project is shared with a group, backing it up without the appropriate permissions can cause the backup to fail. --- .gitlab-ci | 2 +- .gitlab-ci.yml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci b/.gitlab-ci index 77a91f9..83f4f61 160000 --- a/.gitlab-ci +++ b/.gitlab-ci @@ -1 +1 @@ -Subproject commit 77a91f9210b767e07697518d6c347b9bbf64c669 +Subproject commit 83f4f6105c29cecfb6d636b6cfea6c8f5214a54b diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 7ef4f66..995d9cb 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -4,9 +4,9 @@ # --------------------------------------------------------------------------------------- include: - project: '${CI_PROJECT_ROOT_NAMESPACE}/yocto/infrastructure/gitlab-ci' - ref: 77a91f9210b767e07697518d6c347b9bbf64c669 + ref: 83f4f6105c29cecfb6d636b6cfea6c8f5214a54b file: 'manifest-integration.yml' variables: - GITLAB_CI_REVISION: 77a91f9210b767e07697518d6c347b9bbf64c669 + GITLAB_CI_REVISION: 83f4f6105c29cecfb6d636b6cfea6c8f5214a54b BB_RECIPE_NAME: emc-test-suite -- GitLab