From 12f4905c0bb195ebd742d8e5ba85a6e6ed08ac2c Mon Sep 17 00:00:00 2001 From: gitbot <gitbot@garz-fricke.com> Date: Mon, 4 Sep 2023 06:21:40 +0000 Subject: [PATCH] Integrate gitlab-ci/improve-variable-naming and 8 more -- Commit: https://git.seco.com/seco-ne/yocto/infrastructure/gitlab-ci/-/commit/17b87f84e71a326169355a10f896f30924661adc Refactoring: remove CI_PARAM_ prefix from variables There is no need to add a prefix to the variables. Basically every variable can be set or overridden at the trigger level, so we just use plain variable names for everything. -- Commit: https://git.seco.com/seco-ne/yocto/infrastructure/gitlab-ci/-/commit/825f3686809f7e9d5ed9886f42932524af3af75d Refactoring: do not rename *_PATH variables in build.env We were using different variable names for the same variable in build and package stages. Unify these names in order to reduce potential confusion. -- Commit: https://git.seco.com/seco-ne/yocto/infrastructure/gitlab-ci/-/commit/2346bb98e0f5c298c711cd91c2bf89e71722aa30 Refactoring: make build variable naming consistent Use underscore to separate words within variable name. -- Commit: https://git.seco.com/seco-ne/yocto/infrastructure/gitlab-ci/-/commit/581541b9c8ffd6363b29ad7421dce7d26078049a Refactoring: improve FNG_INSTALL_URL definition FNG_INSTALL_URL was defined in build.env only, and in order to use it during the build we sourced build.env after writing it. Remove this workaround and define the variable cleanly in the first place. This removes the intermediate variable FNG_INSTALL_PATH. Also move the "/artifact" path from JOB_URL to FNG_INSTALL_URL in order to make the JOB_URL variable name match better. -- Commit: https://git.seco.com/seco-ne/yocto/infrastructure/gitlab-ci/-/commit/35784f29b51c4a1afa9e71c22e9a47cb593d7628 Refactoring: improve IMAGEPATH et al. definition On every usage of IMAGEPATH, SDKPATH and LICENSESPATH we prepended BUILDPATH to it. Prepend it directly on definition to prevent repetition. Also remove redundant variable IMAGEBASEPATH. -- Commit: https://git.seco.com/seco-ne/yocto/infrastructure/gitlab-ci/-/commit/5e36715ef6cf98df4c1b98fedddc0c3c50ed4040 Remove needless variables from build.env There were three variables set in build.env of which the values are already known in the environment for all jobs, because they are passed from the parent pipeline. Use the original variables instead of defining new ones. -- Commit: https://git.seco.com/seco-ne/yocto/infrastructure/gitlab-ci/-/commit/84aa6afb4a9396ffc55f450e614d148d60bcfb41 Fix LAVA job name -- Commit: https://git.seco.com/seco-ne/yocto/infrastructure/gitlab-ci/-/commit/8160c7d55f9f228950fde0dc061dcb4153e0b297 Sourcery: enable "low-code-quality" check globally Disable it locally instead, so that 1. new code additions are always checked, and 2. we can refactor one function at a time to make the check pass. -- Commit: https://git.seco.com/seco-ne/yocto/infrastructure/gitlab-ci/-/commit/ef60c37843caf1e8c53bae8efb267ef155bbfc65 Sourcery: keep "for-append-to-extend" check disabled This is another check that suggests changes an average developer without profound Python experience would find hard to understand. Disable it. See for reference: https://docs.sourcery.ai/Reference/Python/Default-Rules/for-append-to-extend/ --- .gitlab-ci | 2 +- .gitlab-ci.yml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci b/.gitlab-ci index cf371ac..17b87f8 160000 --- a/.gitlab-ci +++ b/.gitlab-ci @@ -1 +1 @@ -Subproject commit cf371acad26826d3fc88461af1c9c9f86d6ec192 +Subproject commit 17b87f84e71a326169355a10f896f30924661adc diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 0886724..179bce6 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -4,9 +4,9 @@ # --------------------------------------------------------------------------------------- include: - project: '${CI_PROJECT_ROOT_NAMESPACE}/yocto/infrastructure/gitlab-ci' - ref: cf371acad26826d3fc88461af1c9c9f86d6ec192 + ref: 17b87f84e71a326169355a10f896f30924661adc file: 'manifest-integration.yml' variables: - GITLAB_CI_REVISION: cf371acad26826d3fc88461af1c9c9f86d6ec192 + GITLAB_CI_REVISION: 17b87f84e71a326169355a10f896f30924661adc BB_RECIPE_NAME: secure-element-examples -- GitLab