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

Integrate gitlab-ci/add-variable-for-manual-builds and 2 more

--

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 31575e1c
No related branches found
No related tags found
No related merge requests found
Subproject commit c227e0531a0b9c6a2b23f6ec27ad0afe4bdac8c2 Subproject commit 8e72eac2621d2791214220ff11f6bc3be47c2356
...@@ -4,9 +4,9 @@ ...@@ -4,9 +4,9 @@
# --------------------------------------------------------------------------------------- # ---------------------------------------------------------------------------------------
include: include:
- project: '${CI_PROJECT_ROOT_NAMESPACE}/yocto/infrastructure/gitlab-ci' - project: '${CI_PROJECT_ROOT_NAMESPACE}/yocto/infrastructure/gitlab-ci'
ref: c227e0531a0b9c6a2b23f6ec27ad0afe4bdac8c2 ref: 8e72eac2621d2791214220ff11f6bc3be47c2356
file: 'manifest-integration.yml' file: 'manifest-integration.yml'
variables: variables:
GITLAB_CI_REVISION: c227e0531a0b9c6a2b23f6ec27ad0afe4bdac8c2 GITLAB_CI_REVISION: 8e72eac2621d2791214220ff11f6bc3be47c2356
BB_RECIPE_NAME: qt-multi-screen-compositor BB_RECIPE_NAME: qt-multi-screen-compositor
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