From 5bff5478c85b9e4aa213c7c92c42872a9d42d932 Mon Sep 17 00:00:00 2001 From: gitbot <gitbot@garz-fricke.com> Date: Tue, 18 Oct 2022 13:45:34 +0000 Subject: [PATCH] Integrate gitlab-ci/add-release-suffix and 3 more -- Commit: https://git.seco.com/seco-ne/yocto/infrastructure/gitlab-ci/-/commit/543a217064786c3ac2742c24c09f603de495541d manifest_package: add release suffix Customer specific manifest projects can now set the RELEASE_SUFFIX variable, which then gets appended to the deployment folder names. -- Commit: https://git.seco.com/seco-ne/yocto/infrastructure/gitlab-ci/-/commit/c763c43fc1eecf3d73af61573b9cbadb03db275e alphaplan_fwr: change variable "release_name_local" to "release_name" Otherwise it can be assumed that it might be correlated with outputdir_local, which is not the case. -- Commit: https://git.seco.com/seco-ne/yocto/infrastructure/gitlab-ci/-/commit/2d8d26a5b8c56340b2c7f86798405d5f3c2ba9a7 package_release: more refactoring - Make output-dir an argument that can be passed multiple times instead of hard-coding two dirs with certain meanings. - Remove LOCALDIR variable from package.env, because it is not used anywhere (only occurence was job class ".uploadsdkftp" which wasn't used anywhere either). -- Commit: https://git.seco.com/seco-ne/yocto/infrastructure/gitlab-ci/-/commit/dc3698c8d0568853fc675ee74e68b6be802df71a package_release: refactoring Improve readability of package_release.py and its submodule generate_release_metadata.py. - Add describing comments throughout the file. - Remove duplicate code from functions. Simplify them, so that they do what their names say (and nothing more). - Rename variables and function arguments to make their purpose clearer. - Harmonize variable names with their corresponding command line arguments. - Add pydoc for functions. - Add type declarations to function arguments. - Generate MD5 and metadata files in the source directories so that they can be copied along with the rest of the files. --- .gitlab-ci | 2 +- .gitlab-ci.yml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci b/.gitlab-ci index c831d1da915a4..543a217064786 160000 --- a/.gitlab-ci +++ b/.gitlab-ci @@ -1 +1 @@ -Subproject commit c831d1da915a4ac386554ff5ba2f73a8ff0d3da3 +Subproject commit 543a217064786c3ac2742c24c09f603de495541d diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index adca13bc6477c..6597437dc5612 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -4,11 +4,11 @@ # --------------------------------------------------------------------------------------- include: - project: '${CI_PROJECT_ROOT_NAMESPACE}/yocto/infrastructure/gitlab-ci' - ref: c831d1da915a4ac386554ff5ba2f73a8ff0d3da3 + ref: 543a217064786c3ac2742c24c09f603de495541d file: 'manifest-integration.yml' variables: - GITLAB_CI_REVISION: c831d1da915a4ac386554ff5ba2f73a8ff0d3da3 + GITLAB_CI_REVISION: 543a217064786c3ac2742c24c09f603de495541d 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