| Message ID | 20240214153341.3543690-3-Sai.Sathujoda@toshiba-tsip.com (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | Upload .swu file and firmware for LAVA testing | expand |
I sincerely apologize for sending incomplete patch for this file. I request all of you please ignore this v2 patch series. Thanks and regards, Sai Ashrith Sathujoda -----Original Message----- From: Sai.Sathujoda@toshiba-tsip.com <Sai.Sathujoda@toshiba-tsip.com> Sent: Wednesday, February 14, 2024 9:04 PM To: cip-dev@lists.cip-project.org; jan.kiszka@siemens.com Cc: ashrith sai(ＴＳＩＰ) <Sai.Sathujoda@toshiba-tsip.com>; dinesh kumar(ＴＳＩＰ TMIEC ODG Porting) <dinesh.kumar@toshiba-tsip.com>; hayashi kazuhiro(林 和宏 ＤＭＥ ○ＤＩＧ□ＭＰＳ○ＭＰ４) <kazuhiro3.hayashi@toshiba.co.jp> Subject: [isar-cip-core v2 2/2] .gitlab-ci.yml: Add condition check in .build_base to build v2 image From: Sai Sathujoda <Sai.Sathujoda@toshiba-tsip.com> To re-use the built artifacts of v1 image, the consecutive build must happen in the project directory of the job. So if use_swu is enabled, then a consecutive build with a minor recipe change is done to get an .swu artifact for swupdate testing in LAVA. Signed-off-by: Sai Sathujoda <Sai.Sathujoda@toshiba-tsip.com> --- .gitlab-ci.yml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 4f87ec3..8ce7118 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -25,6 +25,7 @@ variables: dtb: none deploy: enable deploy_kernelci: disable + use_swu: disable stages: - build @@ -66,6 +67,12 @@ default: - echo "Building ${base_yaml}" - kas build ${base_yaml} - if [ "${deploy}" = "enable" ]; then scripts/deploy-cip-core.sh ${release} ${target} ${extension} ${dtb} ${CI_COMMIT_REF_SLUG}; fi + - > + if [ "${use_swu}" = "enable" ]; then + echo "PV = \"2.0\"" >> recipes-core/images/cip-core-image-security.bb + kas build ${base_yaml} + scripts/deploy-cip-core.sh ${release} ${target} ${extension} ${dtb} ${CI_COMMIT_REF_SLUG} ${use_swu} + fi - if [ "${deploy_kernelci}" = "enable" ]; then scripts/deploy-kernelci.py ${release} ${target} ${extension} ${dtb}; fi # base image -- 2.30.2
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 4f87ec3..8ce7118 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -25,6 +25,7 @@ variables: dtb: none deploy: enable deploy_kernelci: disable + use_swu: disable stages: - build @@ -66,6 +67,12 @@ default: - echo "Building ${base_yaml}" - kas build ${base_yaml} - if [ "${deploy}" = "enable" ]; then scripts/deploy-cip-core.sh ${release} ${target} ${extension} ${dtb} ${CI_COMMIT_REF_SLUG}; fi + - > + if [ "${use_swu}" = "enable" ]; then + echo "PV = \"2.0\"" >> recipes-core/images/cip-core-image-security.bb + kas build ${base_yaml} + scripts/deploy-cip-core.sh ${release} ${target} ${extension} ${dtb} ${CI_COMMIT_REF_SLUG} ${use_swu} + fi - if [ "${deploy_kernelci}" = "enable" ]; then scripts/deploy-kernelci.py ${release} ${target} ${extension} ${dtb}; fi # base image