ci fixes
cover ci fixes
This fixes ci, keeping the parallel build.
Obsoletes "ci: Fix hihope-rzg2m deployment".
Jan
Jan Kiszka (3):
hihope-rzg2m: Align kas filename with machine name
ci: Do not try to deploy the security image linux-cip Switch to gitlab source and update to 4.19.140-cip33
.gitlab-ci.yml | 8 +++++---
kas/board/{rzg2m.yml => hihope-rzg2m.yml} | 0
recipes-kernel/linux/linux-cip-common.inc | 4 +++-
recipes-kernel/linux/linux-cip-rt-common.inc | 2 --
recipes-kernel/linux/linux-cip-rt_4.19.135-cip31-rt13.bb | 2 +-
recipes-kernel/linux/linux-cip-rt_4.4.231-cip47-rt30.bb | 2 +-
...-cip_4.19.138-cip32.bb => linux-cip_4.19.140-cip33.bb} | 2 +-
recipes-kernel/linux/linux-cip_4.4.230-cip47.bb | 2 +-
8 files changed, 12 insertions(+), 10 deletions(-)
rename kas/board/{rzg2m.yml => hihope-rzg2m.yml} (100%)
rename recipes-kernel/linux/{linux-cip_4.19.138-cip32.bb => linux-cip_4.19.140-cip33.bb} (67%)Signature · 1 line
2.26.2
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#5336): https://lists.cip-project.org/g/cip-dev/message/5336
Mute This Topic: https://lists.cip-project.org/mt/76530562/4520388
Group Owner: [email protected]
Unsubscribe: https://lists.cip-project.org/g/cip-dev/leave/8129055/727948398/xyzzy [[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-
PATCH 1/3 hihope-rzg2m: Align kas filename with machine name
From: Jan Kiszka <[email protected]>
This allows for fixing the extends-based CI build.
---
.gitlab-ci.yml | 4 ++--
kas/board/{rzg2m.yml => hihope-rzg2m.yml} | 0
2 files changed, 2 insertions(+), 2 deletions(-)
rename kas/board/{rzg2m.yml => hihope-rzg2m.yml} (100%).gitlab-ci.yml +2 -2
@@ -57,7 +57,7 @@ build:hihope-rzg2m-base: extends: - .build_base variables: - target: rzg2m + target: hihope-rzg2m dtb: renesas/r8a774a1-hihope-rzg2m-ex.dtb build:qemu-amd64-base:
@@ -97,6 +97,6 @@ build:hihope-rzg2m-test: extends: - .build_base variables: - target: rzg2m + target: hihope-rzg2m extention: test dtb: renesas/r8a774a1-hihope-rzg2m-ex.dtb
kas/board/hihope-rzg2m.yml renamed from kas/board/rzg2m.yml +0 -0
Signature · 1 line
2.26.2
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#5339): https://lists.cip-project.org/g/cip-dev/message/5339
Mute This Topic: https://lists.cip-project.org/mt/76530565/4520388
Group Owner: [email protected]
Unsubscribe: https://lists.cip-project.org/g/cip-dev/leave/8129055/727948398/xyzzy [[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-
Re: [cip-dev] [isar-cip-core][PATCH 1/3] hihope-rzg2m: Align kas filename with machine name
Hi,
Thanks for fix this issue.
Quoted 7 lines
-----Original Message-----
From: Jan Kiszka [mailto:[email protected]]
Sent: Monday, August 31, 2020 6:21 PM
To: [email protected]
Cc: iwamatsu nobuhiro(岩松 信洋 □SWC◯ACT) <[email protected]>
Subject: [isar-cip-core][PATCH 1/3] hihope-rzg2m: Align kas filename with machine name
Quoted 6 lines
From: Jan Kiszka <[email protected]>
This allows for fixing the extends-based CI build.
Fixes 3510f8a66f80 ("ci: Rewrite using extends")Signed-off-by Jan Kiszka <[email protected]>
Best regards,
Nobuhiro
Quoted 32 lines
--- .gitlab-ci.yml | 4 ++-- kas/board/{rzg2m.yml => hihope-rzg2m.yml} | 0 2 files changed, 2 insertions(+), 2 deletions(-) rename kas/board/{rzg2m.yml => hihope-rzg2m.yml} (100%).gitlab-ci.yml +2
-2@@ -57,7 +57,7 @@ build:hihope-rzg2m-base: extends: - .build_base variables: - target: rzg2m + target: hihope-rzg2m dtb: renesas/r8a774a1-hihope-rzg2m-ex.dtb build:qemu-amd64-base:@@ -97,6 +97,6 @@ build:hihope-rzg2m-test: extends: - .build_base variables: - target: rzg2m + target: hihope-rzg2m extention: test dtb: renesas/r8a774a1-hihope-rzg2m-ex.dtbkas/board/hihope-rzg2m.yml renamed from kas/board/rzg2m.yml +0
-1--
Quoted 1 line
2.26.2
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#5342): https://lists.cip-project.org/g/cip-dev/message/5342
Mute This Topic: https://lists.cip-project.org/mt/76530565/4520388
Group Owner: [email protected]
Unsubscribe: https://lists.cip-project.org/g/cip-dev/leave/8129055/727948398/xyzzy [[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-
PATCH 2/3 ci: Do not try to deploy the security image
In reply to Jan KiszkaFrom: Jan Kiszka <[email protected]>
This is not used, and the image is not available, so it breaks the build.
--- .gitlab-ci.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
.gitlab-ci.yml +3 -1
@@ -7,6 +7,7 @@ variables: use_rt: enable targz: enable dtb: none + deploy: enable stages: - build
@@ -30,7 +31,7 @@ default: - if [ "${extention}" != "base" ]; then base_yaml="${base_yaml}:kas/opt/${extention}.yml"; fi; - if [ "${targz}" = "enable" ]; then base_yaml="${base_yaml}:kas/opt/targz-img.yml"; fi; - kas build ${base_yaml} - - scripts/deploy-cip-core.sh ${release} ${target} ${extention} ${dtb} + - if [ "${deploy}" = "enable" ]; then scripts/deploy-cip-core.sh ${release} ${target} ${extention} ${dtb}; fi # base image build:simatic-ipc227e-base:
@@ -68,6 +69,7 @@ build:qemu-amd64-base: extention: security use_rt: disable targz: disable + deploy: disable # test build:simatic-ipc227e-test:
Signature · 1 line
2.26.2
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#5337): https://lists.cip-project.org/g/cip-dev/message/5337
Mute This Topic: https://lists.cip-project.org/mt/76530563/4520388
Group Owner: [email protected]
Unsubscribe: https://lists.cip-project.org/g/cip-dev/leave/8129055/727948398/xyzzy [[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-
Re: [cip-dev] [isar-cip-core][PATCH 2/3] ci: Do not try to deploy the security image
Hi,
Quoted 7 lines
-----Original Message-----
From: Jan Kiszka [mailto:[email protected]]
Sent: Monday, August 31, 2020 6:21 PM
To: [email protected]
Cc: iwamatsu nobuhiro(岩松 信洋 □SWC◯ACT) <[email protected]>
Subject: [isar-cip-core][PATCH 2/3] ci: Do not try to deploy the security image
Quoted 7 lines
From: Jan Kiszka <[email protected]>
This is not used, and the image is not available, so it breaks the build.
Fixes 3510f8a66f80 ("ci: Rewrite using extends")Signed-off-by Jan Kiszka <[email protected]>
I checked this patch. The problem has been fixed.
Best regards,
Nobuhiro
Quoted 34 lines
--- .gitlab-ci.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-).gitlab-ci.yml +3
-2@@ -7,6 +7,7 @@ variables: use_rt: enable targz: enable dtb: none + deploy: enable stages: - build@@ -30,7 +31,7 @@ default: - if [ "${extention}" != "base" ]; then base_yaml="${base_yaml}:kas/opt/${extention}.yml"; fi; - if [ "${targz}" = "enable" ]; then base_yaml="${base_yaml}:kas/opt/targz-img.yml"; fi; - kas build ${base_yaml} - - scripts/deploy-cip-core.sh ${release} ${target} ${extention} ${dtb} + - if [ "${deploy}" = "enable" ]; then scripts/deploy-cip-core.sh ${release} ${target} ${extention} ${dtb}; fi # base image build:simatic-ipc227e-base:@@ -68,6 +69,7 @@ build:qemu-amd64-base: extention: security use_rt: disable targz: disable + deploy: disable # test build:simatic-ipc227e-test: --
Quoted 1 line
2.26.2
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#5343): https://lists.cip-project.org/g/cip-dev/message/5343
Mute This Topic: https://lists.cip-project.org/mt/76530563/4520388
Group Owner: [email protected]
Unsubscribe: https://lists.cip-project.org/g/cip-dev/leave/8129055/727948398/xyzzy [[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-
PATCH 3/3 linux-cip Switch to gitlab source and update to 4.19.140-cip33
In reply to Jan KiszkaFrom: Jan Kiszka <[email protected]>
The switch is needed as kernel.org snapshot tend to fail too often.
---
recipes-kernel/linux/linux-cip-common.inc | 4 +++-
recipes-kernel/linux/linux-cip-rt-common.inc | 2 --
recipes-kernel/linux/linux-cip-rt_4.19.135-cip31-rt13.bb | 2 +-
recipes-kernel/linux/linux-cip-rt_4.4.231-cip47-rt30.bb | 2 +-
...inux-cip_4.19.138-cip32.bb => linux-cip_4.19.140-cip33.bb} | 2 +-
recipes-kernel/linux/linux-cip_4.4.230-cip47.bb | 2 +-
6 files changed, 7 insertions(+), 7 deletions(-)
rename recipes-kernel/linux/{linux-cip_4.19.138-cip32.bb => linux-cip_4.19.140-cip33.bb} (67%)recipes-kernel/linux/linux-cip-common.inc +3 -1
@@ -20,10 +20,12 @@ def conditional(variable, checkvalue, truevalue, falsevalue, d): require recipes-kernel/linux/linux-custom.inc SRC_URI += " \ - https://git.kernel.org/pub/scm/linux/kernel/git/cip/linux-cip.git/snapshot/linux-cip-${PV}.tar.gz \ + https://gitlab.com/cip-project/cip-kernel/linux-cip/-/archive/v${PV}/linux-cip-v${PV}.tar.gz \ " SRC_URI_append = " ${@conditional("USE_CIP_KERNEL_CONFIG", "1", \ "git://gitlab.com/cip-project/cip-kernel/cip-kernel-config.git;protocol=https;destsuffix=cip-kernel-config;name=cip-kernel-config", \ "file://${KERNEL_DEFCONFIG}",d)}" SRCREV_cip-kernel-config ?= "ca24d965adf77730caf1cd32bdfcffd69e369502" + +S = "${WORKDIR}/linux-cip-v${PV}"
recipes-kernel/linux/linux-cip-rt-common.inc +0 -2
@@ -13,8 +13,6 @@ require linux-cip-common.inc SRC_URI += "file://preempt-rt.cfg" -S = "${WORKDIR}/linux-cip-${PV}" - do_prepare_build_prepend() { cat ${WORKDIR}/preempt-rt.cfg >> ${WORKDIR}/${KERNEL_DEFCONFIG} }
recipes-kernel/linux/linux-cip-rt_4.19.135-cip31-rt13.bb +1 -1
@@ -11,4 +11,4 @@ require linux-cip-rt-common.inc -SRC_URI[sha256sum] = "3c3e49c4ad0dae3de409d51a5b8f6df163f7cc54350764d7c019741947a383db" +SRC_URI[sha256sum] = "b827f45b8f97b71b3917c84b43fd6593030d01ea7261d3be6c15a76250308743"
recipes-kernel/linux/linux-cip-rt_4.4.231-cip47-rt30.bb +1 -1
@@ -11,4 +11,4 @@ require linux-cip-rt-common.inc -SRC_URI[sha256sum] = "d1ff83665455830129f9a2197000abbe7440d30e29b37504c82324c777f0ebf5" +SRC_URI[sha256sum] = "e7a0c7b8e4d91f52cbc2ee17a546d1afbc5fcfed95ba44dd113e534fab3a157e"
recipes-kernel/linux/linux-cip_4.19.140-cip33.bb renamed from recipes-kernel/linux/linux-cip_4.19.138-cip32.bb +1 -1
@@ -11,4 +11,4 @@ require linux-cip-common.inc -SRC_URI[sha256sum] = "6b4dce2ff494b9a4cab212af855b78048756dc6ea3f136e25552b0e832e93eb6" +SRC_URI[sha256sum] = "f6a9aec6848a5897c90bafda5a9eba010c03d5d0cf99508adfb1cf7a2f4af9e5"
recipes-kernel/linux/linux-cip_4.4.230-cip47.bb +1 -1
@@ -11,4 +11,4 @@ require linux-cip-common.inc -SRC_URI[sha256sum] = "8e91374801da67bc240b08cd0d61a1b528c23c870cf73ba33cc8f02198f6c531" +SRC_URI[sha256sum] = "3ff33e497064ba8e7d9b5e1ee575c6a936154fa8216774782cbc0db2e4b71cdf"
Signature · 1 line
2.26.2
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#5338): https://lists.cip-project.org/g/cip-dev/message/5338
Mute This Topic: https://lists.cip-project.org/mt/76530564/4520388
Group Owner: [email protected]
Unsubscribe: https://lists.cip-project.org/g/cip-dev/leave/8129055/727948398/xyzzy [[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-
Re: [cip-dev] [isar-cip-core][PATCH 3/3] linux-cip Switch to gitlab source and update to 4.19.140-cip33
Hi,
Quoted 27 lines
-----Original Message-----
From: [email protected] [mailto:[email protected]] On Behalf Of Jan Kiszka
Sent: Monday, August 31, 2020 6:21 PM
To: [email protected]
Cc: iwamatsu nobuhiro(岩松 信洋 □SWC◯ACT) <[email protected]>
Subject: [cip-dev] [isar-cip-core][PATCH 3/3] linux-cip Switch to gitlab source and update to 4.19.140-cip33From: Jan Kiszka <[email protected]>
The switch is needed as kernel.org snapshot tend to fail too often.
Signed-off-by Jan Kiszka <[email protected]>--- recipes-kernel/linux/linux-cip-common.inc | 4 +++- recipes-kernel/linux/linux-cip-rt-common.inc | 2 -- recipes-kernel/linux/linux-cip-rt_4.19.135-cip31-rt13.bb | 2 +- recipes-kernel/linux/linux-cip-rt_4.4.231-cip47-rt30.bb | 2 +- ...inux-cip_4.19.138-cip32.bb => linux-cip_4.19.140-cip33.bb} | 2 +- recipes-kernel/linux/linux-cip_4.4.230-cip47.bb | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) rename recipes-kernel/linux/{linux-cip_4.19.138-cip32.bb => linux-cip_4.19.140-cip33.bb} (67%)recipes-kernel/linux/linux-cip-common.inc +0
-0
recipes-kernel/linux/linux-cip-common.inc def conditional(variable, checkvalue, truevalue, falsevalue, d): · line 23
Quoted 5 lines
recipes-kernel/linux/linux-cip-common.inc +1
-1@@ -20,10 +20,12 @@ def conditional(variable, checkvalue, truevalue, falsevalue, d): require recipes-kernel/linux/linux-custom.inc SRC_URI += " \ - https://git.kernel.org/pub/scm/linux/kernel/git/cip/linux-cip.git/snapshot/linux-cip-${PV}.tar.gz \ + https://gitlab.com/cip-project/cip-kernel/linux-cip/-/archive/v${PV}/linux-cip-v${PV}.tar.gz \
I thought it would be good to use a URL as a variable and overwrite it. Is it difficult because the hash of the file changes depending on the mirror?
Quoted 69 lines
recipes-kernel/linux/linux-cip-common.inc +0
-0" SRC_URI_append = " ${@conditional("USE_CIP_KERNEL_CONFIG", "1", \"
git://gitlab.com/cip-project/cip-kernel/cip-kernel-config.git;protocol=https;destsuffix=cip-kernel-config;name=cip-kernel-config", \ "file://${KERNEL_DEFCONFIG}",d)}"SRCREV_cip-kernel-config ?= "
ca24d965adf77730caf1cd32bdfcffd69e369502"recipes-kernel/linux/linux-cip-common.inc +2
-0+ +S = "${WORKDIR}/linux-cip-v${PV}"recipes-kernel/linux/linux-cip-rt-common.inc +0
-2@@ -13,8 +13,6 @@ require linux-cip-common.inc SRC_URI += "file://preempt-rt.cfg" -S = "${WORKDIR}/linux-cip-${PV}" - do_prepare_build_prepend() { cat ${WORKDIR}/preempt-rt.cfg >> ${WORKDIR}/${KERNEL_DEFCONFIG} }recipes-kernel/linux/linux-cip-rt_4.19.135-cip31-rt13.bb +1
-1@@ -11,4 +11,4 @@ require linux-cip-rt-common.inc -SRC_URI[sha256sum] = "3c3e49c4ad0dae3de409d51a5b8f6df163f7cc54350764d7c019741947a383db" +SRC_URI[sha256sum] = "b827f45b8f97b71b3917c84b43fd6593030d01ea7261d3be6c15a76250308743"recipes-kernel/linux/linux-cip-rt_4.4.231-cip47-rt30.bb +1
-1@@ -11,4 +11,4 @@ require linux-cip-rt-common.inc -SRC_URI[sha256sum] = "d1ff83665455830129f9a2197000abbe7440d30e29b37504c82324c777f0ebf5" +SRC_URI[sha256sum] = "e7a0c7b8e4d91f52cbc2ee17a546d1afbc5fcfed95ba44dd113e534fab3a157e"recipes-kernel/linux/linux-cip_4.19.140-cip33.bb renamed from recipes-kernel/linux/linux-cip_4.19.138-cip32.bb +1
-1@@ -11,4 +11,4 @@ require linux-cip-common.inc -SRC_URI[sha256sum] = "6b4dce2ff494b9a4cab212af855b78048756dc6ea3f136e25552b0e832e93eb6" +SRC_URI[sha256sum] = "f6a9aec6848a5897c90bafda5a9eba010c03d5d0cf99508adfb1cf7a2f4af9e5"recipes-kernel/linux/linux-cip_4.4.230-cip47.bb +1
-2@@ -11,4 +11,4 @@ require linux-cip-common.inc -SRC_URI[sha256sum] = "8e91374801da67bc240b08cd0d61a1b528c23c870cf73ba33cc8f02198f6c531" +SRC_URI[sha256sum] = "3ff33e497064ba8e7d9b5e1ee575c6a936154fa8216774782cbc0db2e4b71cdf" --
Quoted 1 line
2.26.2
Best regards,
Nobuhiro
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#5344): https://lists.cip-project.org/g/cip-dev/message/5344
Mute This Topic: https://lists.cip-project.org/mt/76530564/4520388
Group Owner: [email protected]
Unsubscribe: https://lists.cip-project.org/g/cip-dev/leave/8129055/727948398/xyzzy [[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-
Re: [cip-dev] [isar-cip-core][PATCH 3/3] linux-cip Switch to gitlab source and update to 4.19.140-cip33
Quoted 31 lines · Nobuhiro Iwamatsu
Hi,
Quoted 29 lines
-----Original Message-----
From: [email protected] [mailto:[email protected]] On Behalf Of Jan Kiszka
Sent: Monday, August 31, 2020 6:21 PM
To: [email protected]
Cc: iwamatsu nobuhiro(岩松 信洋 □SWC◯ACT) <[email protected]>
Subject: [cip-dev] [isar-cip-core][PATCH 3/3] linux-cip Switch to gitlab source and update to 4.19.140-cip33From: Jan Kiszka <[email protected]>
The switch is needed as kernel.org snapshot tend to fail too often.
Signed-off-by Jan Kiszka <[email protected]>--- recipes-kernel/linux/linux-cip-common.inc | 4 +++- recipes-kernel/linux/linux-cip-rt-common.inc | 2 -- recipes-kernel/linux/linux-cip-rt_4.19.135-cip31-rt13.bb | 2 +- recipes-kernel/linux/linux-cip-rt_4.4.231-cip47-rt30.bb | 2 +- ...inux-cip_4.19.138-cip32.bb => linux-cip_4.19.140-cip33.bb} | 2 +- recipes-kernel/linux/linux-cip_4.4.230-cip47.bb | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) rename recipes-kernel/linux/{linux-cip_4.19.138-cip32.bb => linux-cip_4.19.140-cip33.bb} (67%)recipes-kernel/linux/linux-cip-common.inc +0
-0@@ -20,10 +20,12 @@ def conditional(variable, checkvalue, truevalue, falsevalue, d): require recipes-kernel/linux/linux-custom.inc
Quoted 6 lines
recipes-kernel/linux/linux-cip-common.inc def conditional(variable, checkvalue, truevalue, falsevalue, d): · line 23
Quoted 3 lines
recipes-kernel/linux/linux-cip-common.inc +1
-1SRC_URI += " \ - https://git.kernel.org/pub/scm/linux/kernel/git/cip/linux-cip.git/snapshot/linux-cip-${PV}.tar.gz \ + https://gitlab.com/cip-project/cip-kernel/linux-cip/-/archive/v${PV}/linux-cip-v${PV}.tar.gz \I thought it would be good to use a URL as a variable and overwrite it. Is it difficult because the hash of the file changes depending on the mirror?
Yes, unfortunately. gitlab packages differently (under a different directory) than korg. That prevents simply providing one as a fallback mirror of the other, at least when pulling tarballs rather than full git trees.
Jan
Signature · 2 lines
Siemens AG, Corporate Technology, CT RDA IOT SES-DE Corporate Competence Center Embedded Linux
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#5348): https://lists.cip-project.org/g/cip-dev/message/5348
Mute This Topic: https://lists.cip-project.org/mt/76530564/4520388
Group Owner: [email protected]
Unsubscribe: https://lists.cip-project.org/g/cip-dev/leave/8129055/727948398/xyzzy [[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-