From 175aaa78ae80d2e1f288174171a3872fbd659615 Mon Sep 17 00:00:00 2001
From: gitbot <gitbot@garz-fricke.com>
Date: Tue, 31 May 2022 06:50:03 +0000
Subject: [PATCH] Integrate meta-seconorth-distro/update-gitlab-ci
--
Commit: https://git.seco.com/seco-ne/yocto/layers/meta-seconorth-distro/-/commit/bca1635740287b570ec111749cba949b3335275a
Integrate gitlab-ci/fix-port-for-lava-tests and 1 more
--
Commit: https://git.seco.com/seco-ne/yocto/infrastructure/gitlab-ci/-/commit/6fbbf3388fee9045aea7bb4aab77700895119ff1
CI: Add fake lava test to ci-test, reduce fetch depth in update submodule
--
Commit: https://git.seco.com/seco-ne/yocto/infrastructure/gitlab-ci/-/commit/d820110cc888a833a722256526a9e18e0b40b12c
CI: Add variable containing the port for ssh access of the gitlab instance
Our server installation uses port 4444 for ssh access. The lava tests
didn't took this into account.
--
Commit: https://git.seco.com/seco-ne/yocto/layers/meta-seconorth-distro/-/commit/88c53f5127e1853fc4306d6eb06a78876008342f
Integrate gitlab-ci/rename-to-seconorth
--
Commit: https://git.seco.com/seco-ne/yocto/infrastructure/gitlab-ci/-/commit/a06956de3e293dcce042a134765d0191c4aaa12a
Rename layers to seconorth
--
Commit: https://git.seco.com/seco-ne/yocto/layers/meta-seconorth-distro/-/commit/fc026a5d3a58020a2b8fe7958e6a062438882a74
Integrate gitlab-ci/increase-timeout-for-infrastructure-jobs
--
Commit: https://git.seco.com/seco-ne/yocto/infrastructure/gitlab-ci/-/commit/67b0195a53de9352fcc4f665552f627ba40ee2b8
CI: Increase infrastructure timeout to 10min
--
Commit: https://git.seco.com/seco-ne/yocto/layers/meta-seconorth-distro/-/commit/be6d55777783777495b4899b23edbfe00d04b12a
Integrate gitlab-ci/fix-gitlab-ci-integration
--
Commit: https://git.seco.com/seco-ne/yocto/infrastructure/gitlab-ci/-/commit/2d2210b6eb0bde67827278addbae85eac00fad66
CI: deploy-gitlab-ci: Don't stop integration when one project is already updated
Prior to this change the integration stop when one of the projects had
already the latest ref of gitlab-ci in to submodule.
--
Commit: https://git.seco.com/seco-ne/yocto/layers/meta-seconorth-distro/-/commit/36e89030fd6aa13c0eb76d9dabd53688ef7524b8
Integrate gitlab-ci/fix-gitlab-ci-integration and 6 more
--
Commit: https://git.seco.com/seco-ne/yocto/infrastructure/gitlab-ci/-/commit/6f09c66c167965b172141c188760d21bd2bb7c04
CI: deploy-gitlab-ci: Don't stop integration when one project is already updated
Prior to this change the integration stop when one of the
projects had already the latest ref of gitlab-ci in to submodule.
--
Commit: https://git.seco.com/seco-ne/yocto/infrastructure/gitlab-ci/-/commit/6c39166fad1f1296e05475a65b5bba65f8535ae8
CI: deploy-gitlab-ci: Don't stop integration when one project is already updated
Prior to this change the integration stop when one of the projects had
already the latest ref of gitlab-ci in to submodule.
--
Commit: https://git.seco.com/seco-ne/yocto/infrastructure/gitlab-ci/-/commit/aaac8d1c7aa9d7ff4cb062160fa1d2dd2a42501c
changelog_generator: Use logging instead of print, fix black
--
Commit: https://git.seco.com/seco-ne/yocto/infrastructure/gitlab-ci/-/commit/79afb233b108b4a71f52874edbfea11b639f55cd
CI: Move changelog_generator to gitlab-ci project
The script can also be run in the normal python container, so this
slightly reduces the complexity.
--
Commit: https://git.seco.com/seco-ne/yocto/infrastructure/gitlab-ci/-/commit/383a5acaebfd9cfa006cca35f0480b8972643a57
Added qt-multi-screen-compositor to project list
--
Commit: https://git.seco.com/seco-ne/yocto/infrastructure/gitlab-ci/-/commit/3e88ad8eace46f5671586c9dc17a4c2ad3ea9cb7
buildfng: Moved the image and distro variables to global
The image and distro for the buildfng job can now be set via
global/external variables.
--
Commit: https://git.seco.com/seco-ne/yocto/infrastructure/gitlab-ci/-/commit/751fc360fbf4883043557cdc7f6c5a5da558c6c0
Improve CI documentation
BCS 746-000636
--
Commit: https://git.seco.com/seco-ne/yocto/layers/meta-seconorth-distro/-/commit/9ee19c99914daad6cfd1ccb8a91040e543dc855b
Integrate gitlab-ci/fix-reuse-of-outdated-integration-branch and 2 more
--
Commit: https://git.seco.com/seco-ne/yocto/infrastructure/gitlab-ci/-/commit/bcb6076bc67279ac451d5d0d3449bbc89c4830d6
CI: Add check if integration branch is on top of target branch before reusing it
The integration branch was reused even if there where new commits on the
target branch, which could lead into reverting some changes.
This adds a check, if the existing integration branch is directly based
on the target branch and deletes it if not.
--
Commit: https://git.seco.com/seco-ne/yocto/infrastructure/gitlab-ci/-/commit/3b5e9be0f5548af8ad42ab9b2701b7804c4cada6
CI: Pull new changelog_generator image, add token to the call.
BCS 746-000785
--
Commit: https://git.seco.com/seco-ne/yocto/infrastructure/gitlab-ci/-/commit/968886c04551d2dc5ee9d82298cd3f9d448402bf
Update README.md: Add description on the gitlab-ci CI and how to deploy
--
Commit: https://git.seco.com/seco-ne/yocto/layers/meta-seconorth-distro/-/commit/554095d54703a4dd2f0dac822d731aaec9a5245f
Integrate gitlab-ci/remove-dual-espresso-image-build and 19 more
--
Commit: https://git.seco.com/seco-ne/yocto/infrastructure/gitlab-ci/-/commit/f2b7ec9024a50695f1e4daa3e4b52fe27112d96f
CI: Remove build for dual espresso again
The pipeline is not setup to build from different manifest and so on,
and the dual_espresso manifest will probably go to a seperate repo
to keep it private.
--
Commit: https://git.seco.com/seco-ne/yocto/infrastructure/gitlab-ci/-/commit/b81d573a50101ca7a288e55cd66fee5070420045
CI: Remove '--verbose' from deploy step
--
Commit: https://git.seco.com/seco-ne/yocto/infrastructure/gitlab-ci/-/commit/c1ebf70c13ce48b45c2674ba2f7b255dcc6a3ed7
manifest: Added manifest file selection to ci-test
--
Commit: https://git.seco.com/seco-ne/yocto/infrastructure/gitlab-ci/-/commit/1285aad74b80fab2f0daaa50e39e087dc2b0c519
manifest: Added manifest file name to integration script
BCS 746-000518
--
Commit: https://git.seco.com/seco-ne/yocto/infrastructure/gitlab-ci/-/commit/dc6d78589f23a437d5c539e3c78cb685c07f95c5
build: Added DualEspresso
--
Commit: https://git.seco.com/seco-ne/yocto/infrastructure/gitlab-ci/-/commit/0941262ac4d461a78799f7b69ef11e051690c86a
layers: Added nogplv3 and dual-espresso layer to CI/CD
--
Commit: https://git.seco.com/seco-ne/yocto/infrastructure/gitlab-ci/-/commit/6c3a8ff7c2a5e56bdeaf3f2b1fa0c461520e9070
CI:package_release: Remove "GUF-" prefix from gitlab artifacts dir
BCS 746-000637
--
Commit: https://git.seco.com/seco-ne/yocto/infrastructure/gitlab-ci/-/commit/d809d630c44e5e2ef3476f1bde19b42330e5775e
manifest-CI: Refactor manifest pipeline files
* Split up build and package steps in separate files
* Add additional comments
* Add log output
BCS 746-000637
--
Commit: https://git.seco.com/seco-ne/yocto/infrastructure/gitlab-ci/-/commit/c917791bc6d4a9494db5a393604ab9da23dee22c
Fix remote name on retrigger stage
--
Commit: https://git.seco.com/seco-ne/yocto/infrastructure/gitlab-ci/-/commit/1ba5285343c5b1252cd417067f53c6b917e6f0e8
Move repositories to git.seco.com
Rename variable JENKINSGUF_SSH_PRIVATE_KEY / SSH_PRIVATE_KEY to
GITLAB_PRIVATE_KEY on this occasion, because it contains a private key
that was generated exclusively for this use case. The according public
key has been added as a deploy key in GitLab to all repositories that
this repository needs access to.
Add more detailed documentation concerning this configurationdirectly in
the gitlab-ci files.
--
Commit: https://git.seco.com/seco-ne/yocto/infrastructure/gitlab-ci/-/commit/3e948f5db0c926a1226746fd597b5a53163a0796
manifest: check if docker build folder is empty
BCS DevOps-000035
--
Commit: https://git.seco.com/seco-ne/yocto/infrastructure/gitlab-ci/-/commit/ab3189781f0b0e97c23c7719a5fdbccbf0c4db39
CI: integrate_into_manifest: Fix integration for recipes in SRCREV file
--
Commit: https://git.seco.com/seco-ne/yocto/infrastructure/gitlab-ci/-/commit/976aaec9d9c6ef10defd4b3a7329d366452bd522
CI: deploy_gitlab_ci: Fix merge, integration branch was used after delete
--
Commit: https://git.seco.com/seco-ne/yocto/infrastructure/gitlab-ci/-/commit/65c6f273b63e4d1beca064f6edb3073321fd5cea
CI: Rename foobar to ci-test, like the job names
--
Commit: https://git.seco.com/seco-ne/yocto/infrastructure/gitlab-ci/-/commit/60c311abd4930bf490f13ab13bf2534e160bf842
CI: Reuse existing integration branch preserving manual changes
--
Commit: https://git.seco.com/seco-ne/yocto/infrastructure/gitlab-ci/-/commit/3318487d518476135ce978fe3fa3a113ca29295f
CI: integrate_into_manifest: Fix bug introduced when splitting functions
--
Commit: https://git.seco.com/seco-ne/yocto/infrastructure/gitlab-ci/-/commit/4c74c580f08a1432d7bd89cf2967abbb7e071bf4
CI: disable 'check' job for gitlab-ci integration as integrate is already disabled
--
Commit: https://git.seco.com/seco-ne/yocto/infrastructure/gitlab-ci/-/commit/5d1fb5c4a3613690375c76cb97204eddf9dcd4ac
CI: Enable MR pipeline for integration of gitlab-ci again
Our settings refuse to merge if no pipeline has been run.
--
Commit: https://git.seco.com/seco-ne/yocto/infrastructure/gitlab-ci/-/commit/69d604a4fe09fefe779eb1599da7ff29d86c7c0c
CI: Fix merge pipeline
--
Commit: https://git.seco.com/seco-ne/yocto/infrastructure/gitlab-ci/-/commit/31d6d7dad54ab322345a6f44b3ff913341500f1c
CI: deploy_gitlab_ci: Rework the deployment of gitlab-ci into the child projects
The deploy_gitlab_ci now creates the integration commit and branch in
each passed subproject and create an integration commit in the manifest
containing all these new revisions.
A build is then triggered on this commit to test the functionality.
Split the update_submodule functions to reuse them in different ways.
Remove some previously used files.
BCS 746-000740
---
default.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/default.xml b/default.xml
index 1893fe6a..61f6a16a 100644
--- a/default.xml
+++ b/default.xml
@@ -21,7 +21,7 @@
<project name="meta-freescale.git" revision="2fb1ce365338126aad365012ebb913b3e4a9f1be" remote="fslc" path="sources/meta-freescale" />
<project name="meta-freescale-distro.git" revision="fc15f5003043da23212596be7366ae2547c308ad" remote="fslc" path="sources/meta-freescale-distro" />
<project name="layers/meta-seconorth-machine" revision="8a2a7480229c9c67760b3eee2567d5596189cfdf" remote="seco-ne" path="sources/meta-seconorth-machine" />
- <project name="layers/meta-seconorth-distro" revision="a6a685456a562726f915213e8d69b535c5d4aaab" remote="seco-ne" path="sources/meta-seconorth-distro" />
+ <project name="layers/meta-seconorth-distro" revision="bca1635740287b570ec111749cba949b3335275a" remote="seco-ne" path="sources/meta-seconorth-distro" />
<project name="layers/meta-seconorth-nogplv3" revision="7461d94b2f6b6a22aab65b0eac6c03266beadc75" remote="seco-ne" path="sources/meta-seconorth-nogplv3" />
<project name="config" revision="683204ae915bebbf3ad3a0db22d76630c25ec03b" remote="seco-ne" path=".conf" >
<linkfile dest="setup-environment" src="setup-environment" />
--
GitLab