From c11c524e951cf549e99bcc4a301024a5ed2b42e9 Mon Sep 17 00:00:00 2001
From: gitbot <gitbot@garz-fricke.com>
Date: Mon, 20 Jun 2022 12:55:22 +0000
Subject: [PATCH] Integrate config/update-gitlab-ci
--
Commit: https://git.seco.com/seco-ne/yocto/config/-/commit/e3625d0612228ce1658814e7ced48d12a12987fb
Integrate gitlab-ci/share-yaml-code-for-manifest-integration and 3 more
--
Commit: https://git.seco.com/seco-ne/yocto/infrastructure/gitlab-ci/-/commit/686323c648881a4fa0f3f8ae6e305d17337eecf3
Remove yaml redundancies in manifest-integration
Leave all common yaml parts in manifest-integration.yml and add
manifest-integration-yocto.yml and manifest-integration-ci-test.yml
containing the different variable assignments for each environment.
The repos including these files have to be updated with the new names.
--
Commit: https://git.seco.com/seco-ne/yocto/infrastructure/gitlab-ci/-/commit/4c7510963d7d2385f4aa38843bfd3f1ac628216e
Harmonize manifest-integration yaml files for yocto and ci-test
This is the first step for reducing code duplicates.
BCS 746-000807
--
Commit: https://git.seco.com/seco-ne/yocto/infrastructure/gitlab-ci/-/commit/c877f9c9f8e5e42902d793987179f0f169506443
retrigger: Allow to specify the manifest's remote identifier in a variable
Costum manifest may override this variable
--
Commit: https://git.seco.com/seco-ne/yocto/infrastructure/gitlab-ci/-/commit/d9660a80edc09242d507077a4059531a057f3184
build-jobs.jinja2: Specify master branch variable again
If the MASTER_BRANCH_MANIFEST variable is set in the manifest's
.gitlab-ci.yml file, it may not find its way to the generated job,
if it is not explicitly set during generation.
That is done with this patch.
--
Commit: https://git.seco.com/seco-ne/yocto/config/-/commit/ee635b2322d5494d87705013a3cad11a0d60251c
Integrate gitlab-ci/use-parent-child-build-jobs
--
Commit: https://git.seco.com/seco-ne/yocto/infrastructure/gitlab-ci/-/commit/2e6c1b4ff232614efbdbdcb66cabc4e33d066eb6
Build jobs: Use parent-child jobs to generate needed build jobs
* Move all build, deploy and test stubs to the manifest-build.yml
* Create a new job to generate and trigger the build jobs dynamically
* Add the base jinja2 file for the build jobs.
* Add initial docs for the manifest pipeline
* Remove unused files
--
Commit: https://git.seco.com/seco-ne/yocto/config/-/commit/a06c5a58ac168ff62638d29fecebc008d26daa2c
Integrate gitlab-ci/move-python-scripts-to-subfolder
--
Commit: https://git.seco.com/seco-ne/yocto/infrastructure/gitlab-ci/-/commit/1bc683d5b4393e4205f45c7236c0e702182256f5
Move python scripts to subfolder
BCS 746-000808
--
Commit: https://git.seco.com/seco-ne/yocto/config/-/commit/ea3c622d141f64c2cbe33631397fa193a628b484
bblayers: Removed bblayers for DualEspresso
The bblayers was moved to the custom manifest for the DualEspresso.
--
Commit: https://git.seco.com/seco-ne/yocto/config/-/commit/fec8c55686e95c1d8a01f9090144537920f103b2
bblayers: Search for customer configs in manifest
Some customer related projects provide a bblayers inside
the projects manifest. Added a routine to search for these
custom configs. If a custom config was found, use it and
skip our arch based lookup.
(cherry picked from commit 1d3b4ecf7889303a285b990adc04a2a6ee0eb513)
--
Commit: https://git.seco.com/seco-ne/yocto/config/-/commit/30b76b86dc7807b711e7cf8599f3f23bdf50e110
Integrate gitlab-ci/update-dual-espresso-path and 1 more
--
Commit: https://git.seco.com/seco-ne/yocto/infrastructure/gitlab-ci/-/commit/e6980d48ee67bafe2049ca9d36820070bc1479d1
Update meta-seconorth-dual-espresso path
--
Commit: https://git.seco.com/seco-ne/yocto/infrastructure/gitlab-ci/-/commit/83002e072589dcdac9237a8e4095da2a2904da62
accept_merge_request: explicitly check if MR has merge conflicts
According to the documentation [1] we should get a 406 error from the
API if we try to merge a merge request which has a merge conflict. We
are experiencing a different behaviour, though, where we are getting a
405 error in this case. There is an open GitLab issue on this topic [2].
In our error handling we assumed that the reason for a 405 error is most
likely a required pipeline which is still running. This assumtion,
however, leads to wrong behaviour in cases where no pipeline is started
at all.
Fixing this now by explicitly checking for merge conflicts at the very
beginning of the error handling sequence.
[1]: https://docs.gitlab.com/ee/api/merge_requests.html#merge-a-merge-request
[2]: https://gitlab.com/gitlab-org/gitlab/-/issues/364102
--
Commit: https://git.seco.com/seco-ne/yocto/config/-/commit/9ff3366ce70932d30a384b9988536eadfe28e113
Integrate gitlab-ci/document-skip-build-label
--
Commit: https://git.seco.com/seco-ne/yocto/infrastructure/gitlab-ci/-/commit/0885629d15caf5bfe0b91bff3b55dbb260def2e9
Document "skip build" label
--
Commit: https://git.seco.com/seco-ne/yocto/config/-/commit/5479d7fcea3dc4918fb37a0ef7358d0399756d2b
Integrate gitlab-ci/skip-check-via-label and 1 more
--
Commit: https://git.seco.com/seco-ne/yocto/infrastructure/gitlab-ci/-/commit/5e51407649eaa7b82f3e845a7c2cc8d06e93f6d3
Add possibility to skip MR pipeline check via label
--
Commit: https://git.seco.com/seco-ne/yocto/infrastructure/gitlab-ci/-/commit/ee1516734b94693b8065e1e54c00745bb5b0f850
Add possibility to skip MR pipeline build via label
--
Commit: https://git.seco.com/seco-ne/yocto/config/-/commit/1648ea7dc25127945d1b800bcce3e6a4cea8bf13
Integrate gitlab-ci/allow-check-job-to-fail and 1 more
--
Commit: https://git.seco.com/seco-ne/yocto/infrastructure/gitlab-ci/-/commit/ad9d367e52a0f364f4a3559e5b5005ec554110cb
Allow check job to fail
This makes merging a project MR possible even if the manifest has
received new commits since the MR pipeline build has run. The developer
is responsible for deciding whether it is safe to merge it without
having a build based on the latest manifest.
BCS 746-000794
--
Commit: https://git.seco.com/seco-ne/yocto/infrastructure/gitlab-ci/-/commit/81c2ad857633f9089b0ae8f0a173cf4c282a2e5c
merge_into_manifest: fix error message if MR already exists
--
Commit: https://git.seco.com/seco-ne/yocto/config/-/commit/21402a86f39db6e093e322825a36c059f24e23d4
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/config/-/commit/2abd27549448f88970064800a0483141916138c7
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/config/-/commit/61f4ecc4e16319977cd141b2359561b05a68a977
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/config/-/commit/81ba01f5721c5b0337e1084fc8b8de62703803e2
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/config/-/commit/1d90837f51c54ac494e27355d3747cde02ba1163
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/config/-/commit/58bd07b440ee3efdb83854a4f044efccfccaa9b3
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/config/-/commit/e87f981a9e17e3ae1f897ff26ed2f113c7875fcc
Integrate gitlab-ci/remove-dual-espresso-image-build and 5 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/config/-/commit/683204ae915bebbf3ad3a0db22d76630c25ec03b
setup: Updated layer-paths to seconorth
--
Commit: https://git.seco.com/seco-ne/yocto/config/-/commit/3b5020ebe8e1609f168b8679f56085f9f9a5a008
setup: Increase niceness to make the build server more responsive
Added a higher niceness level to the local.conf (via the setup script).
(cherry picked from commit 1aefc0e94dc3f088660cb62455e2b031302bcb66)
--
Commit: https://git.seco.com/seco-ne/yocto/config/-/commit/93bb0cbf03578a0a60f5b694c9d227e131feb15f
layers: Renaming and sorting of layers
The machine and distro layers have been renamed to seconorth.
Also the layer lists have been sorted.
--
Commit: https://git.seco.com/seco-ne/yocto/config/-/commit/1d048e1553e0fffa51a0787fb60ddebef319f7ca
describe: Updated git-describe to reflect change to Kirkstone
---
default.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/default.xml b/default.xml
index 6199a019..afe01394 100644
--- a/default.xml
+++ b/default.xml
@@ -23,7 +23,7 @@
<project name="layers/meta-seconorth-machine" revision="c5e47375d1d862fdd9107a30028a10fc9afbfcc6" remote="seco-ne" path="sources/meta-seconorth-machine" />
<project name="layers/meta-seconorth-distro" revision="4df8cfb573e4dbf78bf807bdc66822fc66dd93be" remote="seco-ne" path="sources/meta-seconorth-distro" />
<project name="layers/meta-seconorth-nogplv3" revision="407636cbca0b937757f8341c2d2520b11c31b9a9" remote="seco-ne" path="sources/meta-seconorth-nogplv3" />
- <project name="config" revision="2116569bb99bb65ce97275cae2ac175a0e3af497" remote="seco-ne" path=".conf" >
+ <project name="config" revision="e3625d0612228ce1658814e7ced48d12a12987fb" remote="seco-ne" path=".conf" >
<linkfile dest="setup-environment" src="setup-environment" />
</project>
--
GitLab