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

Integrate gitlab-ci/CI-variable-scope-for-CI_PARAM_IMAGE-and-more

--

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

CI: pipeline yocto: Change scope of CI_PARAM_IMAGE, ... to fix fngsystem build

The variables CI_PARAM_IMAGE, CI_PARAM_DISTRO, CI_MACHINE have been
defined outside the job in the '.gitlab-ci.yml' file. This has a lower
precedence then variables defined inside the job, but it seems that
these variables are used in the scope of 'Trigger variables' when
available in the trigger job. These override the value set in the
template. As main results this made FNGSystem jobs build the normal
yocto.
parent 7580fc24
No related branches found
No related tags found
1 merge request!672Integrate gitlab-ci/CI-variable-scope-for-CI_PARAM_IMAGE-and-more
Pipeline #22873 passed with stage
in 8 seconds
Subproject commit ea3aa8164756750f9e8fbfd642ea1ebdf871fc5a Subproject commit c503a6d442e77bd1761d815ffcda7e19a9f71048
...@@ -4,10 +4,10 @@ ...@@ -4,10 +4,10 @@
# --------------------------------------------------------------------------------------- # ---------------------------------------------------------------------------------------
include: include:
- project: '${CI_PROJECT_ROOT_NAMESPACE}/yocto/infrastructure/gitlab-ci' - project: '${CI_PROJECT_ROOT_NAMESPACE}/yocto/infrastructure/gitlab-ci'
ref: ea3aa8164756750f9e8fbfd642ea1ebdf871fc5a ref: c503a6d442e77bd1761d815ffcda7e19a9f71048
file: 'manifest-pipeline-yocto.yml' file: 'manifest-pipeline-yocto.yml'
variables: variables:
MANIFEST_PROJECT_ID: 1725 MANIFEST_PROJECT_ID: 1725
MASTER_BRANCH_MANIFEST: dunfell MASTER_BRANCH_MANIFEST: dunfell
GITLAB_CI_REVISION: ea3aa8164756750f9e8fbfd642ea1ebdf871fc5a GITLAB_CI_REVISION: c503a6d442e77bd1761d815ffcda7e19a9f71048
SRCREV_pn-gf-productiontests = "597db1acb08686761c6d3f041001adf86fb0b721" SRCREV_pn-gf-productiontests = "f11b755a7d4ae8f27fa467809252b7f04e0cf765"
SRCREV_pn-gfeeprom = "bf10aec79392f79246e012f5fbb1dce712c8119d" SRCREV_pn-gfeeprom = "1546ffe79a29daf489eb0e7f7d05bf48341d82ff"
SRCREV_pn-guf-show-demo = "cc174188a17a99d5885bbe0b22afc44b2706b7f9" SRCREV_pn-guf-show-demo = "5fa72c3b67d7e3d477d10c2fb09a14f7bf945e47"
SRCREV_pn-libmdb = "7904b6d9d2e0598703ba9e2c096b661d6633ee65" SRCREV_pn-libmdb = "9446589056f620acad2e29cff3c774249ae4524c"
SRCREV_pn-ltp-guf-tests = "17faf80c12654410988eb6fbfc22ab3269337034" SRCREV_pn-ltp-guf-tests = "6c67120980ebe7231ab5067dacc4fe039fcb99d8"
SRCREV_pn-touchcal-conv = "5e124edd62064ef6065aa0961a7b2a7798bfd4ed" SRCREV_pn-touchcal-conv = "38ef7a28712dec7ad7a422c153102acca06151e2"
SRCREV_pn-gfxml2dto = "ac255d2f25e253e06504b4b666d4b7e8fe7bff0d" SRCREV_pn-gfxml2dto = "0187fdee5fdfd053e8849632603038606a73f1a3"
SRCREV_pn-egalaxi2c = "68c168a83298743eb663ae3cee68e359da267a57" SRCREV_pn-egalaxi2c = "4276b66b94736a7813640dec37f805f03e0acd1c"
SRCREV_pn-gfplatdetect = "e5c7cb8c48520f22cc6f9070073efa8a9650ea12" SRCREV_pn-gfplatdetect = "86c07f63c19e38581e55fbacc82c772d19cc14cc"
SRCREV_pn-xconfig = "e97f57f251412d1bfe1f6f385cc28903acb02f2e" SRCREV_pn-xconfig = "1ded43c998c67588804a088a9356a62396c38604"
SRCREV_pn-linux-guf = "aefe4caa912dae086f704b2aa5fcd9d01d94865b" SRCREV_pn-linux-guf = "149c6256ce7c99c456a32810af5cb53cf3b54fc9"
SRCREV_pn-linux-imx-kuk = "abc30db1783e31a8d9e4e8b788f9d2189a6ba99b" SRCREV_pn-linux-imx-kuk = "4ab24f5f211c15e73398706c086edb478b7e1855"
SRCREV_pn-u-boot-imx = "91f4a15b941d1dd5975ee949fd3b483406d1d0c0" SRCREV_pn-u-boot-imx = "7e12e0310c93b6f4bf48b74b0959199e515cc731"
SRCREV_pn-qt-multi-screen-compositor = "4175bc7fef9d0a7c3ba9b0d2be52e40db52c3ecd" SRCREV_pn-qt-multi-screen-compositor = "293e79fdf8f54dfb9e32520f3d5e8dcbc35941e3"
...@@ -20,10 +20,10 @@ ...@@ -20,10 +20,10 @@
<project name="meta-qt5.git" revision="10f3673fd4b6c6e1e61c23478802f83652475a5f" remote="qt5-github" path="sources/meta-qt5" /> <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.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="meta-freescale-distro.git" revision="5d882cdf079b3bde0bd9869ce3ca3db411acbf3b" remote="fslc" path="sources/meta-freescale-distro" />
<project name="layers/meta-seconorth-machine" revision="137ab6da9b43c5d1f48551569910990cdbdaf5a9" remote="seco-ne" path="sources/meta-seconorth-machine" /> <project name="layers/meta-seconorth-machine" revision="49e3864df1d5c467806e0633fc65a83c6f9c0af1" remote="seco-ne" path="sources/meta-seconorth-machine" />
<project name="layers/meta-seconorth-distro" revision="03983f3e311315dd38e4738458004822cd647b94" remote="seco-ne" path="sources/meta-seconorth-distro" /> <project name="layers/meta-seconorth-distro" revision="097a5e0493628dba867a2888e00b0de59d548f13" remote="seco-ne" path="sources/meta-seconorth-distro" />
<project name="layers/meta-seconorth-nogplv3" revision="43e2816971b61cef57487fd1d74dfac0ec095c81" remote="seco-ne" path="sources/meta-seconorth-nogplv3" /> <project name="layers/meta-seconorth-nogplv3" revision="d6d2e85d44e7f38f785ed84cdb03431c0dc33ede" remote="seco-ne" path="sources/meta-seconorth-nogplv3" />
<project name="config" revision="bec184c5806ced6b0c89111b6d35a42c7a8cd139" remote="seco-ne" path=".conf" > <project name="config" revision="e0d47b7f80f746bac9b4f7fccb24e82c8e99753b" remote="seco-ne" path=".conf" >
<linkfile dest="setup-environment" src="setup-environment" /> <linkfile dest="setup-environment" src="setup-environment" />
</project> </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