From 731291f8e63b62c39dc62ee30a59d6d666d6c8f3 Mon Sep 17 00:00:00 2001
From: Davide Gardenal <davide.gardenal@huawei.com>
Date: Thu, 14 Jul 2022 17:58:12 +0200
Subject: [PATCH] CI: publish SPDX artifacts
Signed-off-by: Davide Gardenal <davide.gardenal@huawei.com>
---
.oniro-ci/build-generic.yaml | 4 ++--
.oniro-ci/machines-and-flavours.yaml | 10 +++++-----
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/.oniro-ci/build-generic.yaml b/.oniro-ci/build-generic.yaml
index a93c14a9..3d9e9c5f 100644
--- a/.oniro-ci/build-generic.yaml
+++ b/.oniro-ci/build-generic.yaml
@@ -257,7 +257,7 @@
variables:
CI_ONIRO_BUILD_FLAVOUR: linux
CI_ONIRO_RECIPE_NAME: oniro-image-base-tests
- CI_ONIRO_JOB_ARTIFACTS: "*.wic.* *.bmap ovmf.qcow2"
+ CI_ONIRO_JOB_ARTIFACTS: "*.wic.* *.bmap ovmf.qcow2 images/*.spdx.*"
CI_ONIRO_BB_LOCAL_CONF_plus_equals_INHERIT: rm_work
CI_ONIRO_BB_LOCAL_CONF_plus_equals_INHERIT: create-spdx
script:
@@ -361,7 +361,7 @@
CI_ONIRO_BUILD_FLAVOUR: zephyr
CI_ONIRO_RECIPE_NAME: zephyr-philosophers
CI_ONIRO_INSTANCE_SIZE: s3.large.2
- CI_ONIRO_JOB_ARTIFACTS: "*.elf *.bin"
+ CI_ONIRO_JOB_ARTIFACTS: "*.elf *.bin images/*.spdx.*"
script:
- !reference [.build-image, script]
- echo 'INHERIT += "create-spdx"' >> conf/local.conf
diff --git a/.oniro-ci/machines-and-flavours.yaml b/.oniro-ci/machines-and-flavours.yaml
index 2ec94387..a4a053ab 100644
--- a/.oniro-ci/machines-and-flavours.yaml
+++ b/.oniro-ci/machines-and-flavours.yaml
@@ -72,7 +72,7 @@ linux-seco-intel-b68-clang:
variables:
MACHINE: seco-intel-b68
CI_ONIRO_BITBAKE_TARGETS: oniro-image-extra-tests
- CI_ONIRO_JOB_ARTIFACTS: ""
+ CI_ONIRO_JOB_ARTIFACTS: "images/*.spdx.*"
linux-seco-intel-b68-extra-gcc:
extends: [.linux-seco-intel-b68-extra, .toolchain-gcc]
linux-seco-intel-b68-extra-clang:
@@ -85,7 +85,7 @@ linux-seco-intel-b68-extra-clang:
# This platform requires proprietary resources to boot.
# See build-generic.yaml for explanation of CI_ONIRO_BB_LOCAL_CONF_ variables.
CI_ONIRO_BB_LOCAL_CONF_ACCEPT_FSL_EULA: 1
- CI_ONIRO_JOB_ARTIFACTS: ""
+ CI_ONIRO_JOB_ARTIFACTS: "images/*.spdx.*"
linux-seco-imx8mm-c61-2gb-gcc:
extends: [.linux-seco-imx8mm-c61-2gb, .toolchain-gcc]
linux-seco-imx8mm-c61-2gb-clang:
@@ -98,7 +98,7 @@ linux-seco-imx8mm-c61-2gb-clang:
# This platform requires proprietary resources to boot.
# See build-generic.yaml for explanation of CI_ONIRO_BB_LOCAL_CONF_ variables.
CI_ONIRO_BB_LOCAL_CONF_ACCEPT_FSL_EULA: 1
- CI_ONIRO_JOB_ARTIFACTS: "*.wic.* *.bmap flash.bin-seco-imx8mm-c61*"
+ CI_ONIRO_JOB_ARTIFACTS: "*.wic.* *.bmap flash.bin-seco-imx8mm-c61* images/*.spdx.*"
linux-seco-imx8mm-c61-4gb-gcc:
extends: [.linux-seco-imx8mm-c61-4gb, .toolchain-gcc]
linux-seco-imx8mm-c61-4gb-clang:
@@ -112,7 +112,7 @@ linux-seco-imx8mm-c61-4gb-clang:
# This platform requires proprietary resources to boot.
# See build-generic.yaml for explanation of CI_ONIRO_BB_LOCAL_CONF_ variables.
CI_ONIRO_BB_LOCAL_CONF_ACCEPT_FSL_EULA: 1
- CI_ONIRO_JOB_ARTIFACTS: ""
+ CI_ONIRO_JOB_ARTIFACTS: "images/*.spdx.*"
linux-seco-imx8mm-c61-4gb-extra-gcc:
extends: [.linux-seco-imx8mm-c61-4gb-extra, .toolchain-gcc]
linux-seco-imx8mm-c61-4gb-extra-clang:
@@ -175,7 +175,7 @@ zephyr-96b-nitrogen-tests-clang:
variables:
MACHINE: 96b-nitrogen
CI_ONIRO_RECIPE_NAME: zephyr-kernel-test-twister
- CI_ONIRO_JOB_ARTIFACTS: "twister*.tar.bz2"
+ CI_ONIRO_JOB_ARTIFACTS: "twister*.tar.bz2 images/*.spdx.*"
zephyr-96b-nitrogen-twister-gcc:
extends: [.zephyr-96b-nitrogen-twister, .toolchain-gcc]
zephyr-96b-nitrogen-twister-clang:
--
GitLab