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

Integrate gitlab-ci/do-not-cancel-previous-pipelines-on-master and 1 more 

--

Commit: seco-ne/yocto/infrastructure/gitlab-ci@9d430fe8

Manifest integration: do not cancel previous pipelines on master

--

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

Fix error handling on merge

GitLab API has changed:
https://gitlab.com/gitlab-org/gitlab/-/merge_requests/94164/diffs#diff-content-c201dae00b72426693ddcb40edf6005e7702e935
parent a626c2d3
No related branches found
No related tags found
1 merge request!1074Integrate gitlab-ci/do-not-cancel-previous-pipelines-on-master and 1 more
Pipeline #54398 passed with stage
Stage:
    in 12 seconds
    Hide whitespace changes
    Inline Side-by-side
    .gitlab-ci @ 9d430fe8
    Compare a59a93a0...9d430fe8
    Subproject commit a59a93a03ce80d179ecce8c5a3865b06f010a04c
    Subproject commit 9d430fe85bd049af05210b103a55e69171c5994b
    .gitlab-ci.yml
    + 2
    − 2
    View file @ ed864686
    ......@@ -4,13 +4,13 @@
    # ---------------------------------------------------------------------------------------
    include:
    - project: '${CI_PROJECT_ROOT_NAMESPACE}/yocto/infrastructure/gitlab-ci'
    ref: a59a93a03ce80d179ecce8c5a3865b06f010a04c
    ref: 9d430fe85bd049af05210b103a55e69171c5994b
    file: 'manifest-pipeline-yocto.yml'
    variables:
    MANIFEST_PROJECT_ID: 1725
    MASTER_BRANCH: dunfell
    GITLAB_CI_REVISION: a59a93a03ce80d179ecce8c5a3865b06f010a04c
    GITLAB_CI_REVISION: 9d430fe85bd049af05210b103a55e69171c5994b
    generate-build-jobs:
    variables:
    ......
    SRCREV.conf
    + 14
    − 14
    View file @ ed864686
    SRCREV_pn-gf-productiontests = "f665d4434b6b57ea4a043b97c497594ec51d3e53"
    SRCREV_pn-gfeeprom = "60baf053f4285b3856acf7d916487b1e902f55d2"
    SRCREV_pn-guf-show-demo = "978cf227692734add2a2f815ee0df68de6331646"
    SRCREV_pn-libmdb = "5b5f41eebce68f8affcf621f30d533591bbf6d30"
    SRCREV_pn-ltp-guf-tests = "36aa198e5e9ca0774cc564de3f615c4c6d1d75a0"
    SRCREV_pn-touchcal-conv = "cf052ec06f8e1041e8ae8e12366a9a944a7244b2"
    SRCREV_pn-gfxml2dto = "caea83c80c72864f9be13d6d083a823ac696f69a"
    SRCREV_pn-egalaxi2c = "6d8feafdb39d9f5389e1b883c93902195478ddc6"
    SRCREV_pn-gfplatdetect = "a863e6138b3ae641c5175f828b822e1148ad3740"
    SRCREV_pn-xconfig = "65ce01639fbf251a75e6030cfbc95a7e82a5c735"
    SRCREV_pn-linux-guf = "d9a23cc5a08e0aa9cffdc0c7a92ef377fd1464d7"
    SRCREV_pn-linux-imx-kuk = "e6397bc80e0373f7d52f809f55723834e4629990"
    SRCREV_pn-u-boot-imx = "4ed73b38e8d44310c5c0feeca82be3fe4c07be2e"
    SRCREV_pn-qt-multi-screen-compositor = "6b273984896b60e183c9c815ccfb3933506dc811"
    SRCREV_pn-gf-productiontests = "1bbf2d5c1d2e1d32b837a4794026e21e06e51ed5"
    SRCREV_pn-gfeeprom = "980bc0d37ec01042611aaca8f08dbab06ac1e558"
    SRCREV_pn-guf-show-demo = "249c8f2aadc61118a50f07a0fa66c621d2c1ef9a"
    SRCREV_pn-libmdb = "bc8fe639bd0b506b0b37701c9ffd60a484074062"
    SRCREV_pn-ltp-guf-tests = "845a4113ec6c03697411ed1327358b0eaa8fc30d"
    SRCREV_pn-touchcal-conv = "1aab23d5f388f5fd3c00885249ff1d17302afebf"
    SRCREV_pn-gfxml2dto = "9149c6ed9ed502b96e89e1f9af7fa0c827c24ac2"
    SRCREV_pn-egalaxi2c = "bae1061d691261c28bddad181ccfd9ce87bf5986"
    SRCREV_pn-gfplatdetect = "513ba7efd5ea339593c2d9fae1ad036ba08fe5e8"
    SRCREV_pn-xconfig = "3177e49fe495a2ad40a524f63a00c277056fad52"
    SRCREV_pn-linux-guf = "67937994102ee707222cc8871133622d9fb6f7c7"
    SRCREV_pn-linux-imx-kuk = "6b5b3baefad4e9df30a1494fdf76302cb8158457"
    SRCREV_pn-u-boot-imx = "792805a857fd067150cac231671ef62e87cc41b1"
    SRCREV_pn-qt-multi-screen-compositor = "401c83c87c9d8a3fdb309d6b991b826d2bb293c6"
    default.xml
    + 4
    − 4
    View file @ ed864686
    ......@@ -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="53ec75d27bc1178d6ba74a1d3f0c560970139990" remote="seco-ne" path="sources/meta-seconorth-machine" />
    <project name="layers/meta-seconorth-distro" revision="aebb88e1b57a3ad59031c91a90dcd7bdce3ee866" remote="seco-ne" path="sources/meta-seconorth-distro" />
    <project name="layers/meta-seconorth-nogplv3" revision="11ec68ea1cc9b0670c6de5e7eff180326b37ae71" remote="seco-ne" path="sources/meta-seconorth-nogplv3" />
    <project name="config" revision="71ee9f6d35ecf4addbd5589dacce208d95cf6bf9" remote="seco-ne" path=".conf" >
    <project name="layers/meta-seconorth-machine" revision="352f13fff7051d27c2defd1b2e156c76fa0c8db6" remote="seco-ne" path="sources/meta-seconorth-machine" />
    <project name="layers/meta-seconorth-distro" revision="6255567122134e6366d1c98ae717b3f6a5730079" remote="seco-ne" path="sources/meta-seconorth-distro" />
    <project name="layers/meta-seconorth-nogplv3" revision="7627d1d2a19d05f1b6883ad27a3628d593bd68f9" remote="seco-ne" path="sources/meta-seconorth-nogplv3" />
    <project name="config" revision="bfd44753fa4207024764215267953dae63c0b935" remote="seco-ne" path=".conf" >
    <linkfile dest="setup-environment" src="setup-environment" />
    </project>
    ......
    0% or .
    You are about to add 0 people to the discussion. Proceed with caution.
    Finish editing this message first!
    Please register or to comment