From 445324ca1fac949de54825830f238a951ee1ccc9 Mon Sep 17 00:00:00 2001
From: gitbot <gitbot@seco.com>
Date: Mon, 16 Oct 2023 09:57:48 +0000
Subject: [PATCH] Integrate gitlab-ci/build-documentation-in-dedicated-job and
10 more
--
Commit: https://git.seco.com/seco-ne/yocto/infrastructure/gitlab-ci/-/commit/0a3b14069fdd1178b1bb8bff5616b706978eb30a
Confluence: get only those build jobs with a corresponding successful deploy job
We cannot handle build jobs and deploy jobs similarly, because all build
jobs are successful usually, while not all deploy jobs necessarily have
run. Get build.env only from those build job which have a corresponding
successful deploy job, otherwise MACHINE and SUPPORTED_HARDWARE fields
always contain the full list of built platforms, even if they might have
not been deployed.
--
Commit: https://git.seco.com/seco-ne/yocto/infrastructure/gitlab-ci/-/commit/97228cdbbf6717d151ee8f695cf69becf88b0de9
Move MACHINE variable from deploy.env to build.env
The Confluence stage is the only stage that needs the MACHINE variable.
Since the collect_release_information script already loads the build.env
from the build jobs, there is no need to store this variable in
deploy.env.
--
Commit: https://git.seco.com/seco-ne/yocto/infrastructure/gitlab-ci/-/commit/ba156b0fec91f08af90431cdf5fccd649041d1e5
Confluence: check if variables are defined
--
Commit: https://git.seco.com/seco-ne/yocto/infrastructure/gitlab-ci/-/commit/cae6e28258f81c432066a36a0c35e10485c7ca23
Confluence: improve variable passing to template
Use a general mechanism of storing all job variables for each build job
separately, so that we have all documentation files in the
FILES_documentation variable. This makes the dedicated HTML_FILES
variable obsolete.
The merged variables are still kept, though, so that we have all
machines in the MACHINE variable to loop over.
--
Commit: https://git.seco.com/seco-ne/yocto/infrastructure/gitlab-ci/-/commit/41f8a49fa85d29685d7868c780e6ee9d073aba0c
Confluence: add error handling if artifact not found
--
Commit: https://git.seco.com/seco-ne/yocto/infrastructure/gitlab-ci/-/commit/1a51905748a052d723049f003fe1110a8cf055fc
Make documentation files configurable
This disables the documentation jobs for SDK and FNGSystem.
--
Commit: https://git.seco.com/seco-ne/yocto/infrastructure/gitlab-ci/-/commit/303e24eb3b07b3120fd35e510de0a2042f1d6807
Build documentation in dedicated job
Previously the documentation files were rendered as part of the package
jobs. Each package job converted the same set of static markdown files
to HTML files, which was redundant.
Add dedicated jobs to build, package and deploy the documentation files.
Modify convert_md2html.py to support file globs as arguments.
--
Commit: https://git.seco.com/seco-ne/yocto/infrastructure/gitlab-ci/-/commit/838da58569a7cace39e97a30cf6d6212eeaf9906
Refactoring: move Alphaplan stage code to the end
This reflects the stage order in the code.
--
Commit: https://git.seco.com/seco-ne/yocto/infrastructure/gitlab-ci/-/commit/ff31d083da0a1db32df8832dc871378b7814a008
Refactoring: use multiple MACHINE loops for better structure
This is a preparation for adding dedicated documentation jobs. In order
to have these grouped by stage along with their corresponding machine
jobs, we have to get rid of the giant outer loop and add loops for each
stage instead.
--
Commit: https://git.seco.com/seco-ne/yocto/infrastructure/gitlab-ci/-/commit/69973c951efebb5c6c950ed6854ce31e3bb8633c
Deploy: save deployed files in dotenv variable instead of dedicated file
Previously the deployed files were stored in a dedicated text file
called files.txt. Move this information to a dotenv variable called
FILES, so that we don't need special handling for it in the Confluence
stage.
--
Commit: https://git.seco.com/seco-ne/yocto/infrastructure/gitlab-ci/-/commit/45d040331a30de7ad5e2d3cc2c12ee431396e7a1
Remove disabling sourcery low-code-quality in package_release
This check is not failing anymore since the latest refactorings.
---
.gitlab-ci | 2 +-
.gitlab-ci.yml | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/.gitlab-ci b/.gitlab-ci
index cf0336d..0a3b140 160000
--- a/.gitlab-ci
+++ b/.gitlab-ci
@@ -1 +1 @@
-Subproject commit cf0336d66f92c09f8b0bc404e10c267fc6bb601d
+Subproject commit 0a3b14069fdd1178b1bb8bff5616b706978eb30a
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 7d685e6..aa4ed5a 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -4,9 +4,9 @@
# ---------------------------------------------------------------------------------------
include:
- project: '${CI_PROJECT_ROOT_NAMESPACE}/yocto/infrastructure/gitlab-ci'
- ref: cf0336d66f92c09f8b0bc404e10c267fc6bb601d
+ ref: 0a3b14069fdd1178b1bb8bff5616b706978eb30a
file: 'manifest-integration.yml'
variables:
- GITLAB_CI_REVISION: cf0336d66f92c09f8b0bc404e10c267fc6bb601d
+ GITLAB_CI_REVISION: 0a3b14069fdd1178b1bb8bff5616b706978eb30a
BB_RECIPE_NAME: qt-multi-screen-compositor
--
GitLab