From 12d15c796442d754ad4d30ba5b5799b51dae6f3b Mon Sep 17 00:00:00 2001 From: gitbot <gitbot.north@seco.com> Date: Fri, 24 May 2024 07:49:09 +0000 Subject: [PATCH] Integrate gitlab-ci/delete-infrastucture and 1 more -- Commit: https://git.seco.com/seco-ne/yocto/infrastructure/gitlab-ci/-/commit/01d6973b997cb2879e8af7e28bd1eab1482d26c4 Scripts: Add script to delete all integration/ branches It happens that the integration branches are left over from provious runs of the pipeline, when MRs are closed without merging, for example. Also a bug in the gitlab-ci makes the pipeline fail, when an integration branch should be reused. The new scripts just deletes all integration branch in the given project tree without further checks. Needs to be run manually. -- Commit: https://git.seco.com/seco-ne/yocto/infrastructure/gitlab-ci/-/commit/c05acbe1b9b9e325363de69b3145a222bf9d89a1 Add scripts to setup a virtual python environment Use: ``` cd script source setup_venv.sh ``` to change to the venv. --- .gitlab-ci | 2 +- .gitlab-ci.yml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci b/.gitlab-ci index 58554035..01d6973b 160000 --- a/.gitlab-ci +++ b/.gitlab-ci @@ -1 +1 @@ -Subproject commit 58554035ea3de924cc0670f811c2664224b22d76 +Subproject commit 01d6973b997cb2879e8af7e28bd1eab1482d26c4 diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index da2d0c3b..93b315ab 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -4,8 +4,8 @@ # --------------------------------------------------------------------------------------- include: - project: '${CI_PROJECT_ROOT_NAMESPACE}/yocto/infrastructure/gitlab-ci' - ref: 58554035ea3de924cc0670f811c2664224b22d76 + ref: 01d6973b997cb2879e8af7e28bd1eab1482d26c4 file: 'manifest-integration.yml' variables: - GITLAB_CI_REVISION: 58554035ea3de924cc0670f811c2664224b22d76 + GITLAB_CI_REVISION: 01d6973b997cb2879e8af7e28bd1eab1482d26c4 -- GitLab