From 108d99a5fbd4f3be8da8895f19cf821bebcd7eda Mon Sep 17 00:00:00 2001
From: gitbot <gitbot@garz-fricke.com>
Date: Tue, 22 Aug 2023 05:10:37 +0000
Subject: [PATCH] Integrate gitlab-ci/add-confluence-stage and 2 more

--

Commit: https://git.seco.com/seco-ne/yocto/infrastructure/gitlab-ci/-/commit/f8c1d732dac071905c1992f5c2f432a98d7bef75

Add confluence stage

This adds two jobs to the Yocto pipeline:

 - generate-confluence-page
 - publish-confluence-page

The first one generates a confluence page from a template
(`confluence-page.xml.jinja2`) using information downloaded from all
successful "Deploy FTP" jobs of the same pipeline.

The second one publishes this page in Confluence and displays a link to
the new page. If the page already exists it is overwritten.

The place in Confluence where the new page is published is configurable
via the `CONFLUENCE_SPACE` and `CONFLUENCE_PARENT_ID` variables.

--

Commit: https://git.seco.com/seco-ne/yocto/infrastructure/gitlab-ci/-/commit/fee9493bd8251e0edd519ce76b3cdad4750cb4ba

generate-build-pipeline: re-add YAML format parsing

This was accidentally forgotten in the previous commit.

--

Commit: https://git.seco.com/seco-ne/yocto/infrastructure/gitlab-ci/-/commit/9b777f297a4855f1ca653b91ce2e14021d42c074

Rename "generate_job_from_template" script to "render_jinja2_template"

This makes the script more general and open for other future purposes.
The parsing of the YAML content is conditional now, depending on the new
"format" argument.
---
 .gitlab-ci     | 2 +-
 .gitlab-ci.yml | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.gitlab-ci b/.gitlab-ci
index b20f6b9..f8c1d73 160000
--- a/.gitlab-ci
+++ b/.gitlab-ci
@@ -1 +1 @@
-Subproject commit b20f6b95e2c8dca7d6c4a621259ff22ee5d62dd4
+Subproject commit f8c1d732dac071905c1992f5c2f432a98d7bef75
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 59b247d..ba1f7b0 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -4,8 +4,8 @@
 # ---------------------------------------------------------------------------------------
 include:
   - project: '${CI_PROJECT_ROOT_NAMESPACE}/yocto/infrastructure/gitlab-ci'
-    ref: b20f6b95e2c8dca7d6c4a621259ff22ee5d62dd4
+    ref: f8c1d732dac071905c1992f5c2f432a98d7bef75
     file: 'manifest-integration.yml'
 
 variables:
-  GITLAB_CI_REVISION: b20f6b95e2c8dca7d6c4a621259ff22ee5d62dd4
+  GITLAB_CI_REVISION: f8c1d732dac071905c1992f5c2f432a98d7bef75
-- 
GitLab