From 40e9f602bf34908efbee4a62ab5335d86c7dbd61 Mon Sep 17 00:00:00 2001 From: gitbot <gitbot@garz-fricke.com> Date: Fri, 11 Aug 2023 07:41:02 +0000 Subject: [PATCH] Integrate gitlab-ci/rename-build-jobs-to-build-pipeline and 19 more -- Commit: https://git.seco.com/seco-ne/yocto/infrastructure/gitlab-ci/-/commit/f9dc2517c7e05077cfb0d93acc5269ba684c3f6a Rename "build jobs" to "build pipeline" -- Commit: https://git.seco.com/seco-ne/yocto/infrastructure/gitlab-ci/-/commit/633c9fb4c2c4d1a475e1b7a07b83cd5a303db583 get_pipeline_jobs: remove redundant job ID output -- Commit: https://git.seco.com/seco-ne/yocto/infrastructure/gitlab-ci/-/commit/347745c52249f69678dc8d85a13f520cdf4a1ad3 download_job_artifacts: add error message if artifact not found -- Commit: https://git.seco.com/seco-ne/yocto/infrastructure/gitlab-ci/-/commit/50f7396d1e2089310412002c85acc14c09ed1f0a ci-test: re-enable build simulation caching In 438f1e2aae23472d692ce6314e8c683f950657d2 we accidentally disabled caching for the build simulation by moving the cache definition to a job class. The order of inheritance led to the cache configuration being overwritten by the one of the "buildbase" class. Change inheritance order to fix this. -- Commit: https://git.seco.com/seco-ne/yocto/infrastructure/gitlab-ci/-/commit/30f7d966cadcbaccbcfe01fd8642a49b967722fe update_submodule: fix integration branch name in case of multiple MRs When there are multiple open merge requests for a commit, we currently take the newest one to determine the integration branch name. This is not necessarily the correct one, we can have an open merge request with the commit being part of the commit history while the top commit is a different one. Add a check if the commit is the top commit of the merge request in order to get the correct integration branch name in these cases. -- Commit: https://git.seco.com/seco-ne/yocto/infrastructure/gitlab-ci/-/commit/438f1e2aae23472d692ce6314e8c683f950657d2 ci-test: use more recent release for build simulation -- Commit: https://git.seco.com/seco-ne/yocto/infrastructure/gitlab-ci/-/commit/1c900bf9e27dce552b0c94b9f64e24d53b0bbe77 Update docs/add-new-project-to-pipeline.md -- Commit: https://git.seco.com/seco-ne/yocto/infrastructure/gitlab-ci/-/commit/8854fd8fa473a03cbf39e7238773174475407085 download_job_artifacts: fix temp file creation mkstemp() returns a tuple containing an OS-level handle to an open file (as would be returned by os.open()) and the absolute pathname of that file, in that order. Use higher-level function NamedTemporaryFile() instead. -- Commit: https://git.seco.com/seco-ne/yocto/infrastructure/gitlab-ci/-/commit/151f1cd628f0b9152f3b6cf3e5e8afdea5583b5c Refactoring: remove redundant if See for reference: https://docs.sourcery.ai/Reference/Python/Default-Rules/remove-redundant-if/ -- Commit: https://git.seco.com/seco-ne/yocto/infrastructure/gitlab-ci/-/commit/872ec6d9c07b199214a894be9b7a428b0520c47b Refactoring: swap if and else branches Move the main part of the action to the if branch. See for reference: https://docs.sourcery.ai/Reference/Python/Default-Rules/swap-if-else-branches/ -- Commit: https://git.seco.com/seco-ne/yocto/infrastructure/gitlab-ci/-/commit/c058236c193101ca5ca128a0303a94b7a8959180 Sourcery: skip a certain suggestion for better readability -- Commit: https://git.seco.com/seco-ne/yocto/infrastructure/gitlab-ci/-/commit/b9196ae5a69e726bc6aa030e7e2707270d5c0ca3 Fix typo in comment -- Commit: https://git.seco.com/seco-ne/yocto/infrastructure/gitlab-ci/-/commit/eba0649d0772fba4d0b9c10c0654d3e8119a50ee gitignore: add .vscode and convert line-endings to LF -- Commit: https://git.seco.com/seco-ne/yocto/infrastructure/gitlab-ci/-/commit/876da56d5e78635ec2542508027cdc1cb64db4a9 Refactoring: merge dictionary assignments See for reference: https://docs.sourcery.ai/Reference/Python/Default-Rules/merge-dict-assign/ -- Commit: https://git.seco.com/seco-ne/yocto/infrastructure/gitlab-ci/-/commit/e8e3ff37b7d4b5e6ae48cfac9c0188c3b6e91b5b Refactoring: use single assignment for "if, else" See for reference: https://docs.sourcery.ai/Reference/Python/Default-Rules/assign-if-exp/ -- Commit: https://git.seco.com/seco-ne/yocto/infrastructure/gitlab-ci/-/commit/14eaf45a0bbafea3ed98dde674faa0465250ee1a Refactoring: inline immediately returned variables See for reference: https://docs.sourcery.ai/Reference/Python/Default-Rules/inline-immediately-returned-variable/ -- Commit: https://git.seco.com/seco-ne/yocto/infrastructure/gitlab-ci/-/commit/f9096a522c07f50b12e07e7c6a6560c9f7911c15 Refactoring: use "{}" for creating an empty dictionary This is the most concise and Pythonic way to create a dictionary. See for reference: https://docs.sourcery.ai/Reference/Python/Default-Rules/dict-literal/ -- Commit: https://git.seco.com/seco-ne/yocto/infrastructure/gitlab-ci/-/commit/a3baa39e1f445a5461fbf8f40f7303558730a19d Refactoring: use list comprehensions A list comprehension can create the list on one line, cutting out the clutter of declaring an empty list and then appending values. See for reference: https://docs.sourcery.ai/Reference/Python/Default-Rules/list-comprehension/ -- Commit: https://git.seco.com/seco-ne/yocto/infrastructure/gitlab-ci/-/commit/52de8d7c45ba0aeedd741ba4cf5ad3b9c7042294 Refactoring: use dictionary comprehensions A dictionary comprehension can create the dictionary on one line, cutting out the clutter of declaring an empty dict and then adding items. See for reference: https://docs.sourcery.ai/Reference/Python/Default-Rules/dict-comprehension/ -- Commit: https://git.seco.com/seco-ne/yocto/infrastructure/gitlab-ci/-/commit/5d09b9de95ce4ed6c27df4d147571b0afcd6adb3 Refactoring: simplify length comparisons Something we often do is check whether a list or sequence has elements before we try and do something with it. A Pythonic way of doing this is just to use the fact that Python lists and sequences evaluate to True if they have elements, and False otherwise. Doing it this way is a convention, set out in Python's PEP8 style guide. See for reference: https://docs.sourcery.ai/Reference/Python/Default-Rules/simplify-len-comparison/ --- .gitlab-ci | 2 +- .gitlab-ci.yml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci b/.gitlab-ci index 9406ad7..f9dc251 160000 --- a/.gitlab-ci +++ b/.gitlab-ci @@ -1 +1 @@ -Subproject commit 9406ad752cfe28ca33556df57282c278ef9ece00 +Subproject commit f9dc2517c7e05077cfb0d93acc5269ba684c3f6a diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 6dcefe0..47f046d 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -4,9 +4,9 @@ # --------------------------------------------------------------------------------------- include: - project: '${CI_PROJECT_ROOT_NAMESPACE}/yocto/infrastructure/gitlab-ci' - ref: 9406ad752cfe28ca33556df57282c278ef9ece00 + ref: f9dc2517c7e05077cfb0d93acc5269ba684c3f6a file: 'manifest-integration.yml' variables: - GITLAB_CI_REVISION: 9406ad752cfe28ca33556df57282c278ef9ece00 + GITLAB_CI_REVISION: f9dc2517c7e05077cfb0d93acc5269ba684c3f6a BB_RECIPE_NAME: touchcal-conv -- GitLab