Skip to content
Snippets Groups Projects

CI: cleanup Linux jobs

Open Davide Gardenal requested to merge tony3oo3/oniro:tony/CI_linux_cleanup into kirkstone
Compare and
2 files
+ 29
10
Compare changes
  • Side-by-side
  • Inline
Files
2
@@ -258,7 +258,8 @@
@@ -258,7 +258,8 @@
.build-image:
.build-image:
extends: .build-recipe
extends: .build-recipe
variables:
variables:
CI_ONIRO_JOB_ARTIFACTS: ""
CI_ONIRO_JOB_ARTIFACTS: "*.wic.* *.bmap ovmf.qcow2"
 
CI_ONIRO_STORE_IMAGE_ARTIFACT: 0
script:
script:
- !reference [.build-recipe, script]
- !reference [.build-recipe, script]
# Move artifacts for recovery, which only considers $CI_PROJECT_DIR and
# Move artifacts for recovery, which only considers $CI_PROJECT_DIR and
@@ -276,11 +277,12 @@
@@ -276,11 +277,12 @@
# build and boot.
# build and boot.
- find "$BITBAKE_DEPLOY_DIR"/images/ -name *.wic -exec rm -rf {} \;
- find "$BITBAKE_DEPLOY_DIR"/images/ -name *.wic -exec rm -rf {} \;
- cp -a "$BITBAKE_DEPLOY_DIR"/licenses/ "$CI_PROJECT_DIR"/artifacts || true
- cp -a "$BITBAKE_DEPLOY_DIR"/licenses/ "$CI_PROJECT_DIR"/artifacts || true
# Only copy the files defined in the CI_ONIRO_JOB_ARTIFACTS variable. Most
# If CI_ONIRO_STORE_IMAGE_ARTIFACT is 1 copy the files defined in the CI_ONIRO_JOB_ARTIFACTS variable. Most
# of the remaining files are redundant and quite large.
# of the remaining files are redundant and quite large.
 
- if test "$CI_ONIRO_STORE_IMAGE_ARTIFACT" != "1"; then (echo "CI_ONIRO_STORE_IMAGE_ARTIFACT is not set, artifacts will not be saved!") fi
- |
- |
set -x
set -x
if test -n "$CI_ONIRO_JOB_ARTIFACTS" && test -d "$BITBAKE_DEPLOY_DIR"; then
if test -n "$CI_ONIRO_JOB_ARTIFACTS" && test -d "$BITBAKE_DEPLOY_DIR" && test "$CI_ONIRO_STORE_IMAGE_ARTIFACT" = "1"; then
(
(
cd "$BITBAKE_DEPLOY_DIR"
cd "$BITBAKE_DEPLOY_DIR"
for artifact in $CI_ONIRO_JOB_ARTIFACTS; do
for artifact in $CI_ONIRO_JOB_ARTIFACTS; do
@@ -302,9 +304,27 @@
@@ -302,9 +304,27 @@
variables:
variables:
CI_ONIRO_BB_LOCAL_CONF_plus_equals_INHERIT: create-spdx
CI_ONIRO_BB_LOCAL_CONF_plus_equals_INHERIT: create-spdx
CI_ONIRO_JOB_ARTIFACTS: "*.wic.* *.bmap"
CI_ONIRO_JOB_ARTIFACTS: "*.wic.* *.bmap"
 
CI_ONIRO_STORE_IMAGE_ARTIFACT: 1
script:
script:
- !reference [.build-image, script]
- !reference [.build-image, script]
 
.build-linux-image:
 
extends: .build-image
 
variables:
 
CI_ONIRO_BUILD_FLAVOUR: linux
 
CI_ONIRO_BB_LOCAL_CONF_plus_equals_INHERIT: rm_work
 
CI_ONIRO_BB_LOCAL_CONF_plus_equals_INHERIT: create-spdx
 
 
.build-linux-oniro-image-base:
 
extends: .build-linux-image
 
variables:
 
CI_ONIRO_RECIPE_NAME: oniro-image-base
 
 
.build-linux-oniro-image-tests:
 
extends: .build-linux-image
 
variables:
 
CI_ONIRO_RECIPE_NAME: oniro-image-base-tests
 
.build-rauc-bundle:
.build-rauc-bundle:
extends: .build-image
extends: .build-image
variables:
variables:
Loading