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

Integrate gitlab-ci/unify-image-and-sdk-package-jobs and 3 more

--

Commit: seco-ne/yocto/infrastructure/gitlab-ci@5762a54c

Yocto build: unify image and SDK package jobs

Image and SDK package jobs call the same package script just with
different arguments. Instead of having two job classes `package_release`
and `package_sdk` for these two tasks, merge them into the base class
`package` and make the differences configurable via a variable
`PACKAGE_TYPE`.

--

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

Yocto build: add variable for manual builds

Instead of hard-coding the rules for manual builds in each actual job,
conditionally add this to the `buildbase` class and add a variable
`MANUAL_BUILD` to the according jobs.

--

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

Yocto build: unify image and SDK build jobs

Image and SDK builds share a lot of similar code. Instead of having two
job classes `build_yocto_image` and `build_yocto_sdk` for these two
tasks, merge them into the base class `build_yocto` and make the
differences configurable via a variable.

The `dump_install_command` part of the script, which was not executed
for SDK builds, is always present now, but it's only executed if the
`INSTALLSCRIPT` variable is set, which is not the case for SDK builds.

The `collect_srcrevs` part of the script is executed in all cases. It
was not part of the SDK build before, but it's not less relevant there.

--

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

Yocto build: make main artifacts path configurable

Instead of specifying all possible artifacts paths and abusing the fact
that GitLab ignores non-existing paths during artifact upload, implement
a cleaner solution with a configurable path.
parent 3b491e4d
No related branches found
No related tags found
1 merge request!1305Integrate gitlab-ci/unify-image-and-sdk-package-jobs and 3 more
Pipeline #71516 passed with stage
in 12 seconds
Subproject commit c227e0531a0b9c6a2b23f6ec27ad0afe4bdac8c2
Subproject commit 5762a54c150e5848b2262dba53df1a335af42ae9
......@@ -4,13 +4,13 @@
# ---------------------------------------------------------------------------------------
include:
- project: '${CI_PROJECT_ROOT_NAMESPACE}/yocto/infrastructure/gitlab-ci'
ref: c227e0531a0b9c6a2b23f6ec27ad0afe4bdac8c2
ref: 5762a54c150e5848b2262dba53df1a335af42ae9
file: 'manifest-pipeline-yocto.yml'
variables:
MANIFEST_PROJECT_ID: 1725
MASTER_BRANCH: dunfell
GITLAB_CI_REVISION: c227e0531a0b9c6a2b23f6ec27ad0afe4bdac8c2
GITLAB_CI_REVISION: 5762a54c150e5848b2262dba53df1a335af42ae9
generate-build-jobs:
variables:
......
SRCREV_pn-gf-productiontests = "fc002b5034e73b11bb96dc748a72f7bd4aa5c78a"
SRCREV_pn-gfeeprom = "a5e13aa155877d6398bdc28d09f6f0e25e012317"
SRCREV_pn-gf-productiontests = "f753c27c1dd902c5c604f794a0279c85fcfbd839"
SRCREV_pn-gfeeprom = "7f6a95ad923e09ad58373e6554ed2dfed3562de7"
SRCREV_pn-guf-show-demo = "dd131b8daf8023dea33165ab60c58d8f2e8f1f20"
SRCREV_pn-libmdb = "9eb194ec03cf2428bc1b2940dd3198842c5f577c"
SRCREV_pn-ltp-guf-tests = "a077735349ea8ff586df81f794a2b06cecb29875"
SRCREV_pn-touchcal-conv = "85716f2349b0c949c1981342bb836e17e1e18542"
SRCREV_pn-gfxml2dto = "ee96595639fcc940905440271c75507ebd35ce7a"
SRCREV_pn-egalaxi2c = "238769c8d13ad2e8b7290000c3277b855f807e70"
SRCREV_pn-gfplatdetect = "ac79d0b768a0018fe91c2ef5f0214504d5d77eae"
SRCREV_pn-xconfig = "0d0339334e7c8665a8288542087e0d8dfae949a2"
SRCREV_pn-linux-guf = "d7d4889bd6c64df7c9c39e2b1c4ff1b1cd0db50b"
SRCREV_pn-linux-imx-kuk = "6134b5fa0f108202985f24b24a92207d7664c8a5"
SRCREV_pn-u-boot-imx = "8e8655bf61bf5b393e6b9fcbe3269d4dfc83a99d"
SRCREV_pn-qt-multi-screen-compositor = "31575e1c1dcee97456efefc4953206347ce854ac"
SRCREV_pn-libmdb = "f5958c66437f240c4de5ec02fd312bb3c203a4cc"
SRCREV_pn-ltp-guf-tests = "cc16aa1a5d4c556bf6d4085061a4660941b01237"
SRCREV_pn-touchcal-conv = "9f10be9ec903f801572566f7410b8cef762dcd59"
SRCREV_pn-gfxml2dto = "878630190b6fd52a92dae38cf10ab5d318aea782"
SRCREV_pn-egalaxi2c = "4cbed4bcd97681ac3946494a614101787a50d247"
SRCREV_pn-gfplatdetect = "ca1d94949c5710df1cf004cbf7588eb3c091354b"
SRCREV_pn-xconfig = "acf3ec342205f69c1407c2fbd92864262ac908b3"
SRCREV_pn-linux-guf = "05be8b2558f590696d7ae3025a1dfb48e002eb4e"
SRCREV_pn-linux-imx-kuk = "b1372c65657bd0856c8c0ff684c7c85b6568c58e"
SRCREV_pn-u-boot-imx = "c49cb6078888d102e6b59b095f285a4a5d8695aa"
SRCREV_pn-qt-multi-screen-compositor = "ec82cf0bc38605d7a474fa3af10e8d96c9ced561"
......@@ -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="09cbf6364aea7e3b2c6cadd5f688ae138a521f7b" remote="seco-ne" path="sources/meta-seconorth-machine" />
<project name="layers/meta-seconorth-distro" revision="d4821799cf8e9fd1d732dee46b575b30d1002a33" remote="seco-ne" path="sources/meta-seconorth-distro" />
<project name="layers/meta-seconorth-nogplv3" revision="5cba57b78a637f4deb075172a4f4b0ac8fe33beb" remote="seco-ne" path="sources/meta-seconorth-nogplv3" />
<project name="config" revision="6776ff8b40ed585aeb8944754c03fb69714af704" remote="seco-ne" path=".conf" >
<project name="layers/meta-seconorth-machine" revision="cea9ed2987e95fc82130cb4280fd3214e55845f1" remote="seco-ne" path="sources/meta-seconorth-machine" />
<project name="layers/meta-seconorth-distro" revision="0771c14c96a6d913aaf55427107b21905a73dcb0" remote="seco-ne" path="sources/meta-seconorth-distro" />
<project name="layers/meta-seconorth-nogplv3" revision="d1db60bc768f303c2bef5ea2ab859c912a0e8073" remote="seco-ne" path="sources/meta-seconorth-nogplv3" />
<project name="config" revision="776c10b9fa40467d12647198d28bd3e5da44c3cf" 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