Skip to content
Snippets Groups Projects
Commit 9f6fa038 authored by GitBot's avatar GitBot
Browse files

Integrate gitlab-ci/depend-pipeline-execution-on-branch-protection-state and 2 more

--

Commit: seco-ne/yocto/infrastructure/gitlab-ci@939ade2b

Depend intgration pipeline execution on branch protection state

Previously we had the master branch hard-coded in a variable in order to
determine whether to run the integration pipeline (on non-master branch)
or the merge pipeline (on master branch). This variable had to be
adapted everytime we copy a branch, which can potentially be forgotten
and lead to problems.

Remove the hard-coded branch and use the branch protection state for
this decision instead in order to make this more flexible.

--

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

Simplify yamllint job rules

The rules for the yamllint jobs have been defined in the .yamllint class
before. They were overridden in the manifest pipeline's yamllint job,
though, which has its own rules, so we don't need them to be inherited
in this case. And in the manifest integration pipeline the rules can be
much easier, so define them there instead of at the class-level.

--

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

.gitlab-ci: add analyze stage for limiting YAML script blocks
parent 7ba2f397
No related branches found
No related tags found
No related merge requests found
Pipeline #58915 failed with stage
in 8 seconds
Subproject commit e943a55e90671b62f1d3bab789670a40584e784f
Subproject commit 939ade2b9f98b3e1569332270a7ab16ce7d70b4a
......@@ -4,13 +4,13 @@
# ---------------------------------------------------------------------------------------
include:
- project: '${CI_PROJECT_ROOT_NAMESPACE}/yocto/infrastructure/gitlab-ci'
ref: e943a55e90671b62f1d3bab789670a40584e784f
ref: 939ade2b9f98b3e1569332270a7ab16ce7d70b4a
file: 'manifest-pipeline-yocto.yml'
variables:
MANIFEST_PROJECT_ID: 1725
MASTER_BRANCH: kirkstone
GITLAB_CI_REVISION: e943a55e90671b62f1d3bab789670a40584e784f
GITLAB_CI_REVISION: 939ade2b9f98b3e1569332270a7ab16ce7d70b4a
generate-build-jobs:
variables:
......
SRCREV:pn-atmel-mxt = "9dc5f338bd0fd410772d53d8a22b8dee78572b66"
SRCREV:pn-egalaxi2c = "01e34f8e1655a542967fe07fe99bcb1725494fb5"
SRCREV:pn-emc-test-suite = "800fde3edc77d04c0e37e5fe9e993adcc212bf8b"
SRCREV:pn-gf-productiontests = "e4c8cb4bac3662684c4dfdf239a76fdf906be86d"
SRCREV:pn-gfeeprom = "3ba2bda73e65f1d745fa4b8d09c218e53fe4e820"
SRCREV:pn-gfplatdetect = "818068cd92faa3a021269ede3ba3dab0dd90a102"
SRCREV:pn-gfxml2dto = "266b538d8149058486eeb6b7a95678ba88af2ddd"
SRCREV:pn-egalaxi2c = "39c6843ccc9639df4e2e15a2261bc71e4b685b26"
SRCREV:pn-emc-test-suite = "4ddcc8decbaefe2a08cd75645330c0caa39f1d3e"
SRCREV:pn-gf-productiontests = "9974777330e86499e67fe321e922514708acc6d6"
SRCREV:pn-gfeeprom = "a89a12b4c25e4c24bfa4c96804d8df87b050741d"
SRCREV:pn-gfplatdetect = "00d9d170f8101771bbaac975357c569980c0620c"
SRCREV:pn-gfxml2dto = "53909555eaf7e05f4eb96120d643bf0b135490eb"
SRCREV:pn-ilitek = "a74fba8cc783cfeeb771040a5fe669071183c139"
SRCREV:pn-kernel-module-touchgpio = "0823903ee1552e30477d7db942401af05ea5424a"
SRCREV:pn-libmdb = "f045765ba92362a4540236cf0fd6a1f3d8462aab"
SRCREV:pn-linux-imx = "3185c5156de8feeeebbdf941402bb1fc931d5056"
SRCREV:pn-libmdb = "e274a4b52ae2c740459cbcdcd11197b49a7f2487"
SRCREV:pn-linux-imx = "548c6422d529119d2209b2786b10a15a7a640e2e"
SRCREV:pn-linux-imx-kuk = "0258f07c61364958e3307da11a388e72baffb03a"
SRCREV:pn-linux-seconorth = "4c573ecdc4d8945b12c682e5483a048079228683"
SRCREV:pn-qt-multi-screen-compositor = "7886ab76282ae5e8187146be2c0001f7482ffd23"
SRCREV:pn-seco-show-demo = "db59499643b30968a1aacb095273537d100e55a6"
SRCREV:pn-touchcal-conv = "5cbac33afd89b46654bc8a6dc837cf93708a94b4"
SRCREV:pn-u-boot-imx = "3dfb4239e4638758b4a80687234ec78cb9f015f0"
SRCREV:pn-xconfig = "1a60091e522bb06409ae0b290e0fd36de0e94105"
SRCREV:pn-linux-seconorth = "d2bc93d3b6c7f188c17915b496c0ecdc2266a220"
SRCREV:pn-qt-multi-screen-compositor = "f6048251691a1f0a8c565998efb42205aaaab4b1"
SRCREV:pn-seco-show-demo = "3830d8d05eef4842d76861d719bdf9ecb4d5c277"
SRCREV:pn-touchcal-conv = "1a627ea17d684e479ea05c80c1319d74cfefe336"
SRCREV:pn-u-boot-imx = "abbdec235dd8cab79dbdc07d200d43d4924f3a8b"
SRCREV:pn-xconfig = "d369193237959a6746d81a51d67b8dc97cb753f7"
......@@ -21,10 +21,10 @@
<project name="meta-qt5.git" revision="5b71df60e523423b9df6793de9387f87a149ac42" remote="qt5-github" path="sources/meta-qt5" />
<project name="meta-freescale.git" revision="dd98526300937450d741c9b3403799632f417226" 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="35b770deb4a6c6c016015e0f7df02b7da936e41d" remote="seco-ne" path="sources/meta-seconorth-machine" />
<project name="layers/meta-seconorth-distro" revision="ade0cf35a9757d033756efc96d3fd0dd4d415d79" remote="seco-ne" path="sources/meta-seconorth-distro" />
<project name="layers/meta-seconorth-nogplv3" revision="882fcaaa5f8db37a2fec0b3c5e0d7d7b97fdabd3" remote="seco-ne" path="sources/meta-seconorth-nogplv3" />
<project name="config" revision="fc953c9a5585d3160d82ed400c312f474936000a" remote="seco-ne" path=".conf" >
<project name="layers/meta-seconorth-machine" revision="da7c10192d911daf023882ab93e1cdfce7ee1176" remote="seco-ne" path="sources/meta-seconorth-machine" />
<project name="layers/meta-seconorth-distro" revision="5c870acda8087443064f6747b652a336ecc1d2dc" remote="seco-ne" path="sources/meta-seconorth-distro" />
<project name="layers/meta-seconorth-nogplv3" revision="887c736dab3e893cacf5423f985d769a76853915" remote="seco-ne" path="sources/meta-seconorth-nogplv3" />
<project name="config" revision="6b2591d3371bb744260f94cc2ab23190452eb5b8" 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