Skip to content
Snippets Groups Projects
Commit 2af1b469 authored by GitBot's avatar GitBot
Browse files

Integrate gitlab-ci/fix-manifest-commit and 8 more

--

Commit: seco-ne/yocto/infrastructure/gitlab-ci@3eef782e

deploy_gitlab_ci: integrate only correct projects into the manifest

Previously we integrated all projects into the manifest, even those that
belonged to a different manifest branch. That led to all manifests
having the same project revisions, even if they should be different due
to different intgrated project branches.

Save a list of integration sources for each manifest branch separately
now, so that we can check which project belongs to which manifest branch
later.

--

Commit: seco-ne/yocto/infrastructure/gitlab-ci@2b851ac6

Fix potential error message in retrigger job

TypeError: 'NoneType' object is not subscriptable
Example:
https://git.seco.com/seco-ne/yocto/infrastructure/ci-test/minimal-manifest/-/jobs/127610

--

Commit: seco-ne/yocto/infrastructure/gitlab-ci@c3fd0ecc

Check if variable is defined before checking it value

--

Commit: seco-ne/yocto/infrastructure/gitlab-ci@c1be0f4b

Fix jinja2 "or" operator

--

Commit: seco-ne/yocto/infrastructure/gitlab-ci@8da534ec

Run integration pipeline for target branch only

When we're integrating a single branch into a single manifest branch,
there is no need to run the intgeration pipeline for all configured
integrations, but only for those that match the target branch of the
current merge request.

--

Commit: seco-ne/yocto/infrastructure/gitlab-ci@8c94b725

ci-test: add job to check for correct foo branch

This should catch an error where during a gitlab-ci merge process the
wrong foo branch is integrated into the manifest, which happened in
Yocto.

--

Commit: seco-ne/yocto/infrastructure/gitlab-ci@163c7e1e

Add yml extension to jinja2 templates

--

Commit: seco-ne/yocto/infrastructure/gitlab-ci@59523aa0

check job: disable verbose output

--

Commit: seco-ne/yocto/infrastructure/gitlab-ci@28bf0065

retrigger: add job states to log message
parent 01a1a016
No related branches found
No related tags found
1 merge request!815Integrate gitlab-ci/fix-manifest-commit and 8 more
Pipeline #28943 passed with stage
in 11 seconds
Subproject commit fd74201777c771cf911112ce8e196f29f9598dd8
Subproject commit 3eef782efc50e805fd4640281aa8039d8594720e
......@@ -4,13 +4,13 @@
# ---------------------------------------------------------------------------------------
include:
- project: '${CI_PROJECT_ROOT_NAMESPACE}/yocto/infrastructure/gitlab-ci'
ref: fd74201777c771cf911112ce8e196f29f9598dd8
ref: 3eef782efc50e805fd4640281aa8039d8594720e
file: 'manifest-pipeline-yocto.yml'
variables:
MANIFEST_PROJECT_ID: 1725
MASTER_BRANCH: dunfell
GITLAB_CI_REVISION: fd74201777c771cf911112ce8e196f29f9598dd8
GITLAB_CI_REVISION: 3eef782efc50e805fd4640281aa8039d8594720e
generate-build-jobs:
variables:
......
SRCREV_pn-gf-productiontests = "54a08f0b62ec6cb6cdb848187e3fb23711e3a46b"
SRCREV_pn-gfeeprom = "98b14ba4497073e49a82aa0eae6e9576e9fd1622"
SRCREV_pn-guf-show-demo = "6aa4c72c44bfde038f6e35a8e705dd4cc26a5760"
SRCREV_pn-libmdb = "82c95bfbf2d9f39a328461d38e8f3a7a1fa8fcb4"
SRCREV_pn-ltp-guf-tests = "0dc681a8eb4eb2ebd551c76f41f822686f26da9b"
SRCREV_pn-touchcal-conv = "5418f254824bea0c7a1acbee37999520f589d538"
SRCREV_pn-gfxml2dto = "956b08e52e132302c8faf19be031154c65d9fee0"
SRCREV_pn-egalaxi2c = "a2a410f5abd9b2cf0ee68c10dca6096a8199cd6d"
SRCREV_pn-gfplatdetect = "0a8638698ff1e24761b37b7fd310afaf49167c0e"
SRCREV_pn-xconfig = "5bd2ecdd71753b627f1d4b74b3f584e3e13e45c0"
SRCREV_pn-linux-guf = "9b40d7f7a76c8a76c975024de373674f7f817834"
SRCREV_pn-linux-imx-kuk = "0258f07c61364958e3307da11a388e72baffb03a"
SRCREV_pn-u-boot-imx = "a48671c4b479a148f3df242cba4e6319b673cb22"
SRCREV_pn-qt-multi-screen-compositor = "78c77b8859f8863adc1d7f83d288437b3e0541b3"
SRCREV_pn-gf-productiontests = "f9fdca86ea264b46949a19885a4ae04748a5807f"
SRCREV_pn-gfeeprom = "f61fa2bd24a5678419f35e467020cd34bb1c467f"
SRCREV_pn-guf-show-demo = "955717737a844580f428c7e201981d642f3aabe0"
SRCREV_pn-libmdb = "4182c1ae9ae2c8c338715d569380dce4e550b81a"
SRCREV_pn-ltp-guf-tests = "c0577ac3de2cf44e701b36bbc219e9a974c2c13d"
SRCREV_pn-touchcal-conv = "56009c595b282df83bd61e029f50b1fcf523a5cb"
SRCREV_pn-gfxml2dto = "e28ae167772acdc9443dd1301c743908a7d9ad3a"
SRCREV_pn-egalaxi2c = "1187628b51e10fcb8c476f1675730546ff2e80bc"
SRCREV_pn-gfplatdetect = "78c4ad382870e2c52e53167f106e2e77b4bbe0ac"
SRCREV_pn-xconfig = "7bced64456919d6e6cda3258deb90d71daa3ebc8"
SRCREV_pn-linux-guf = "12b4e6a58d3683582be81d0c61d1e959655253a4"
SRCREV_pn-linux-imx-kuk = "a666806dfeb0db8832377c19e811a0b02473c7e6"
SRCREV_pn-u-boot-imx = "0a1571f5d527e518849f0888001c45ed88c4e4a3"
SRCREV_pn-qt-multi-screen-compositor = "eea340976cf69891d99bc64ece7a0b9c4b27bdfd"
......@@ -21,10 +21,10 @@
<project name="meta-qt5.git" revision="10f3673fd4b6c6e1e61c23478802f83652475a5f" remote="qt5-github" path="sources/meta-qt5" />
<project name="meta-freescale.git" revision="5a026be5a6b29a27a7754d7fa5d4765c99f98ed9" remote="fslc" path="sources/meta-freescale" />
<project name="meta-freescale-distro.git" revision="5d882cdf079b3bde0bd9869ce3ca3db411acbf3b" remote="fslc" path="sources/meta-freescale-distro" />
<project name="layers/meta-seconorth-machine" revision="8d8f2c5839acb100b6f93072cf259e7f0790ce08" remote="seco-ne" path="sources/meta-seconorth-machine" />
<project name="layers/meta-seconorth-distro" revision="30f0b9df79c58103d4a87106527efedd3a45780b" remote="seco-ne" path="sources/meta-seconorth-distro" />
<project name="layers/meta-seconorth-nogplv3" revision="9b5d9d582e7d238e7392ae1511a2bb3414052310" remote="seco-ne" path="sources/meta-seconorth-nogplv3" />
<project name="config" revision="8199ac581fa98787f918ab1d204bca4cb8ae62e1" remote="seco-ne" path=".conf" >
<project name="layers/meta-seconorth-machine" revision="929275441cce28a843c31407933bba6980519fa8" remote="seco-ne" path="sources/meta-seconorth-machine" />
<project name="layers/meta-seconorth-distro" revision="007e60efba6322a9c8c6b77b75ffbe199643e399" remote="seco-ne" path="sources/meta-seconorth-distro" />
<project name="layers/meta-seconorth-nogplv3" revision="9f52c3a8b60e3c75bc02254d67c19c39f9179d0f" remote="seco-ne" path="sources/meta-seconorth-nogplv3" />
<project name="config" revision="7bc98e54811528abc024f748e15267b14f29a74e" remote="seco-ne" path=".conf" >
<linkfile dest="setup-environment" src="setup-environment" />
</project>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment