| Message ID | 20200831010244.2629769-1-nobuhiro1.iwamatsu@toshiba.co.jp (mailing list archive) |
|---|---|
| State | Accepted |
| Headers | show |
| Series | [isar-cip-core] ci: Change to single job | expand |
On 31.08.20 03:02, Nobuhiro Iwamatsu wrote: > Signed-off-by: Nobuhiro Iwamatsu <nobuhiro1.iwamatsu@toshiba.co.jp> > --- The reason should be documented in the commit log. How about "Parallel fetching of git snapshots from kernel.org often failed, either due to throttling or some problem of the server. We need to avoid this for now." ? Also, this does not address the breakage of the hihope-rzg2m deployment. I'll send a patch, please double check it Jan > .gitlab-ci.yml | 122 +++++++++++++------------------------------------ > 1 file changed, 32 insertions(+), 90 deletions(-) > > diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml > index 802dbcd..5bd4774 100644 > --- a/.gitlab-ci.yml > +++ b/.gitlab-ci.yml > @@ -2,17 +2,10 @@ image: kasproject/kas-isar:1.1 > > variables: > GIT_STRATEGY: clone > - release: buster > - extention: base > - use_rt: enable > - targz: enable > - dtb: none > > -stages: > - - build > - > -default: > - before_script: > +all: > + stage: build > + script: > - export http_proxy=$HTTP_PROXY > - export https_proxy=$HTTPS_PROXY > - export ftp_proxy=$FTP_PROXY > @@ -20,83 +13,32 @@ default: > - export AWS_ACCESS_KEY_ID=$AWS_ACCESS_KEY_ID > - export AWS_SECRET_ACCESS_KEY=$AWS_SECRET_ACCESS_KEY > > -.build_base: > - stage: build > - variables: > - base_yaml: "kas-cip.yml:kas/board/${target}.yml" > - script: > - - sudo rm -rf build/tmp > - - if [ "${use_rt}" = "enable" ]; then base_yaml="${base_yaml}:kas/opt/rt.yml"; fi; > - - 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} > - > -# base image > -build:simatic-ipc227e-base: > - extends: > - - .build_base > - variables: > - target: simatic-ipc227e > - > -build:bbb-base: > - extends: > - - .build_base > - variables: > - target: bbb > - dtb: am335x-boneblack.dtb > - > -build:iwg20m-base: > - extends: > - - .build_base > - variables: > - target: iwg20m > - dtb: r8a7743-iwg20d-q7-dbcm-ca.dtb > - > -build:hihope-rzg2m-base: > - extends: > - - .build_base > - variables: > - target: rzg2m > - dtb: renesas/r8a774a1-hihope-rzg2m-ex.dtb > - > -build:qemu-amd64-base: > - extends: > - - .build_base > - variables: > - target: qemu-amd64 > - extention: security > - use_rt: disable > - targz: disable > - > -# test > -build:simatic-ipc227e-test: > - extends: > - - .build_base > - variables: > - target: simatic-ipc227e > - extention: test > - > -build:bbb-test: > - extends: > - - .build_base > - variables: > - target: bbb > - extention: test > - dtb: am335x-boneblack.dtb > - > -build:iwg20m-test: > - extends: > - - .build_base > - variables: > - target: iwg20m > - extention: test > - dtb: r8a7743-iwg20d-q7-dbcm-ca.dtb > - > -build:hihope-rzg2m-test: > - extends: > - - .build_base > - variables: > - target: rzg2m > - extention: test > - dtb: renesas/r8a774a1-hihope-rzg2m-ex.dtb > + # simatic-ipc227e > + - kas build kas-cip.yml:kas/board/simatic-ipc227e.yml:kas/opt/rt.yml:kas/opt/targz-img.yml > + - scripts/deploy-cip-core.sh buster simatic-ipc227e base none > + # bbb > + - kas build kas-cip.yml:kas/board/bbb.yml:kas/opt/rt.yml:kas/opt/targz-img.yml > + - scripts/deploy-cip-core.sh buster bbb base am335x-boneblack.dtb > + # iwg20m > + - kas build kas-cip.yml:kas/board/iwg20m.yml:kas/opt/rt.yml:kas/opt/targz-img.yml > + - scripts/deploy-cip-core.sh buster iwg20m base r8a7743-iwg20d-q7-dbcm-ca.dtb > + # rzg2m > + - kas build kas-cip.yml:kas/board/rzg2m.yml:kas/opt/rt.yml:kas/opt/targz-img.yml > + - scripts/deploy-cip-core.sh buster rzg2m base renesas/r8a774a1-hihope-rzg2m-ex.dtb > + > + # qemu-amd64 / security > + - kas build kas-cip.yml:kas/board/qemu-amd64.yml:kas/opt/security.yml > + - scripts/deploy-cip-core.sh buster qemu-amd64 security base > + > + # simatic-ipc227e / test > + - kas build kas-cip.yml:kas/board/simatic-ipc227e.yml:kas/opt/rt.yml:kas/opt/test.yml:kas/opt/targz-img.yml > + - scripts/deploy-cip-core.sh buster simatic-ipc227e test none > + # bbb / test > + - kas build kas-cip.yml:kas/board/bbb.yml:kas/opt/rt.yml:kas/opt/test.yml:kas/opt/targz-img.yml > + - scripts/deploy-cip-core.sh buster bbb test am335x-boneblack.dtb > + # iwg20m / test > + - kas build kas-cip.yml:kas/board/iwg20m.yml:kas/opt/rt.yml:kas/opt/test.yml:kas/opt/targz-img.yml > + - scripts/deploy-cip-core.sh buster iwg20m test r8a7743-iwg20d-q7-dbcm-ca.dtb > + # rzg2m / test > + - kas build kas-cip.yml:kas/board/rzg2m.yml:kas/opt/rt.yml:kas/opt/test.yml:kas/opt/targz-img.yml > + - scripts/deploy-cip-core.sh buster rzg2m test renesas/r8a774a1-hihope-rzg2m-ex.dtb > > > >
On 31.08.20 08:01, Jan Kiszka wrote: > On 31.08.20 03:02, Nobuhiro Iwamatsu wrote: >> Signed-off-by: Nobuhiro Iwamatsu <nobuhiro1.iwamatsu@toshiba.co.jp> >> --- > > The reason should be documented in the commit log. How about > > "Parallel fetching of git snapshots from kernel.org often failed, either > due to throttling or some problem of the server. We need to avoid this > for now." > > ? > > Also, this does not address the breakage of the hihope-rzg2m deployment. > I'll send a patch, please double check it > Meanwhile, kernel.org seems to handle our parallel fetches again, see https://gitlab.com/cip-project/cip-core/isar-cip-core/-/pipelines/183722607. I'll drop this patch and focus on fixing the remaining fallouts (missed on, namely the skipped deployment of the security image). Jan
Hi, > -----Original Message----- > From: Jan Kiszka [mailto:jan.kiszka@siemens.com] > Sent: Monday, August 31, 2020 3:02 PM > To: cip-dev@lists.cip-project.org; iwamatsu nobuhiro(岩松 信洋 □ＳＷＣ◯ＡＣＴ) <nobuhiro1.iwamatsu@toshiba.co.jp> > Subject: Re: [cip-dev] [isar-cip-core][PATCH] ci: Change to single job > > On 31.08.20 03:02, Nobuhiro Iwamatsu wrote: > > Signed-off-by: Nobuhiro Iwamatsu <nobuhiro1.iwamatsu@toshiba.co.jp> > > --- > > The reason should be documented in the commit log. How about > > "Parallel fetching of git snapshots from kernel.org often failed, either > due to throttling or some problem of the server. We need to avoid this > for now." > > ? > Right. I will add. > Also, this does not address the breakage of the hihope-rzg2m deployment. > I'll send a patch, please double check it > Oh, sorry, I will check your patch. > Jan Best regards, Nobuhiro > > > .gitlab-ci.yml | 122 +++++++++++++------------------------------------ > > 1 file changed, 32 insertions(+), 90 deletions(-) > > > > diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml > > index 802dbcd..5bd4774 100644 > > --- a/.gitlab-ci.yml > > +++ b/.gitlab-ci.yml > > @@ -2,17 +2,10 @@ image: kasproject/kas-isar:1.1 > > > > variables: > > GIT_STRATEGY: clone > > - release: buster > > - extention: base > > - use_rt: enable > > - targz: enable > > - dtb: none > > > > -stages: > > - - build > > - > > -default: > > - before_script: > > +all: > > + stage: build > > + script: > > - export http_proxy=$HTTP_PROXY > > - export https_proxy=$HTTPS_PROXY > > - export ftp_proxy=$FTP_PROXY > > @@ -20,83 +13,32 @@ default: > > - export AWS_ACCESS_KEY_ID=$AWS_ACCESS_KEY_ID > > - export AWS_SECRET_ACCESS_KEY=$AWS_SECRET_ACCESS_KEY > > > > -.build_base: > > - stage: build > > - variables: > > - base_yaml: "kas-cip.yml:kas/board/${target}.yml" > > - script: > > - - sudo rm -rf build/tmp > > - - if [ "${use_rt}" = "enable" ]; then base_yaml="${base_yaml}:kas/opt/rt.yml"; fi; > > - - 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} > > - > > -# base image > > -build:simatic-ipc227e-base: > > - extends: > > - - .build_base > > - variables: > > - target: simatic-ipc227e > > - > > -build:bbb-base: > > - extends: > > - - .build_base > > - variables: > > - target: bbb > > - dtb: am335x-boneblack.dtb > > - > > -build:iwg20m-base: > > - extends: > > - - .build_base > > - variables: > > - target: iwg20m > > - dtb: r8a7743-iwg20d-q7-dbcm-ca.dtb > > - > > -build:hihope-rzg2m-base: > > - extends: > > - - .build_base > > - variables: > > - target: rzg2m > > - dtb: renesas/r8a774a1-hihope-rzg2m-ex.dtb > > - > > -build:qemu-amd64-base: > > - extends: > > - - .build_base > > - variables: > > - target: qemu-amd64 > > - extention: security > > - use_rt: disable > > - targz: disable > > - > > -# test > > -build:simatic-ipc227e-test: > > - extends: > > - - .build_base > > - variables: > > - target: simatic-ipc227e > > - extention: test > > - > > -build:bbb-test: > > - extends: > > - - .build_base > > - variables: > > - target: bbb > > - extention: test > > - dtb: am335x-boneblack.dtb > > - > > -build:iwg20m-test: > > - extends: > > - - .build_base > > - variables: > > - target: iwg20m > > - extention: test > > - dtb: r8a7743-iwg20d-q7-dbcm-ca.dtb > > - > > -build:hihope-rzg2m-test: > > - extends: > > - - .build_base > > - variables: > > - target: rzg2m > > - extention: test > > - dtb: renesas/r8a774a1-hihope-rzg2m-ex.dtb > > + # simatic-ipc227e > > + - kas build kas-cip.yml:kas/board/simatic-ipc227e.yml:kas/opt/rt.yml:kas/opt/targz-img.yml > > + - scripts/deploy-cip-core.sh buster simatic-ipc227e base none > > + # bbb > > + - kas build kas-cip.yml:kas/board/bbb.yml:kas/opt/rt.yml:kas/opt/targz-img.yml > > + - scripts/deploy-cip-core.sh buster bbb base am335x-boneblack.dtb > > + # iwg20m > > + - kas build kas-cip.yml:kas/board/iwg20m.yml:kas/opt/rt.yml:kas/opt/targz-img.yml > > + - scripts/deploy-cip-core.sh buster iwg20m base r8a7743-iwg20d-q7-dbcm-ca.dtb > > + # rzg2m > > + - kas build kas-cip.yml:kas/board/rzg2m.yml:kas/opt/rt.yml:kas/opt/targz-img.yml > > + - scripts/deploy-cip-core.sh buster rzg2m base renesas/r8a774a1-hihope-rzg2m-ex.dtb > > + > > + # qemu-amd64 / security > > + - kas build kas-cip.yml:kas/board/qemu-amd64.yml:kas/opt/security.yml > > + - scripts/deploy-cip-core.sh buster qemu-amd64 security base > > + > > + # simatic-ipc227e / test > > + - kas build kas-cip.yml:kas/board/simatic-ipc227e.yml:kas/opt/rt.yml:kas/opt/test.yml:kas/opt/targz-img.yml > > + - scripts/deploy-cip-core.sh buster simatic-ipc227e test none > > + # bbb / test > > + - kas build kas-cip.yml:kas/board/bbb.yml:kas/opt/rt.yml:kas/opt/test.yml:kas/opt/targz-img.yml > > + - scripts/deploy-cip-core.sh buster bbb test am335x-boneblack.dtb > > + # iwg20m / test > > + - kas build kas-cip.yml:kas/board/iwg20m.yml:kas/opt/rt.yml:kas/opt/test.yml:kas/opt/targz-img.yml > > + - scripts/deploy-cip-core.sh buster iwg20m test r8a7743-iwg20d-q7-dbcm-ca.dtb > > + # rzg2m / test > > + - kas build kas-cip.yml:kas/board/rzg2m.yml:kas/opt/rt.yml:kas/opt/test.yml:kas/opt/targz-img.yml > > + - scripts/deploy-cip-core.sh buster rzg2m test renesas/r8a774a1-hihope-rzg2m-ex.dtb > > > > > > > > > > -- > 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 (#5341): https://lists.cip-project.org/g/cip-dev/message/5341 Mute This Topic: https://lists.cip-project.org/mt/76525805/4520428 Group Owner: cip-dev+owner@lists.cip-project.org Unsubscribe: https://lists.cip-project.org/g/cip-dev/leave/8129116/1171672734/xyzzy [patchwork-cip-dev@patchwork.kernel.org] -=-=-=-=-=-=-=-=-=-=-=-
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 802dbcd..5bd4774 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -2,17 +2,10 @@ image: kasproject/kas-isar:1.1 variables: GIT_STRATEGY: clone - release: buster - extention: base - use_rt: enable - targz: enable - dtb: none -stages: - - build - -default: - before_script: +all: + stage: build + script: - export http_proxy=$HTTP_PROXY - export https_proxy=$HTTPS_PROXY - export ftp_proxy=$FTP_PROXY @@ -20,83 +13,32 @@ default: - export AWS_ACCESS_KEY_ID=$AWS_ACCESS_KEY_ID - export AWS_SECRET_ACCESS_KEY=$AWS_SECRET_ACCESS_KEY -.build_base: - stage: build - variables: - base_yaml: "kas-cip.yml:kas/board/${target}.yml" - script: - - sudo rm -rf build/tmp - - if [ "${use_rt}" = "enable" ]; then base_yaml="${base_yaml}:kas/opt/rt.yml"; fi; - - 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} - -# base image -build:simatic-ipc227e-base: - extends: - - .build_base - variables: - target: simatic-ipc227e - -build:bbb-base: - extends: - - .build_base - variables: - target: bbb - dtb: am335x-boneblack.dtb - -build:iwg20m-base: - extends: - - .build_base - variables: - target: iwg20m - dtb: r8a7743-iwg20d-q7-dbcm-ca.dtb - -build:hihope-rzg2m-base: - extends: - - .build_base - variables: - target: rzg2m - dtb: renesas/r8a774a1-hihope-rzg2m-ex.dtb - -build:qemu-amd64-base: - extends: - - .build_base - variables: - target: qemu-amd64 - extention: security - use_rt: disable - targz: disable - -# test -build:simatic-ipc227e-test: - extends: - - .build_base - variables: - target: simatic-ipc227e - extention: test - -build:bbb-test: - extends: - - .build_base - variables: - target: bbb - extention: test - dtb: am335x-boneblack.dtb - -build:iwg20m-test: - extends: - - .build_base - variables: - target: iwg20m - extention: test - dtb: r8a7743-iwg20d-q7-dbcm-ca.dtb - -build:hihope-rzg2m-test: - extends: - - .build_base - variables: - target: rzg2m - extention: test - dtb: renesas/r8a774a1-hihope-rzg2m-ex.dtb + # simatic-ipc227e + - kas build kas-cip.yml:kas/board/simatic-ipc227e.yml:kas/opt/rt.yml:kas/opt/targz-img.yml + - scripts/deploy-cip-core.sh buster simatic-ipc227e base none + # bbb + - kas build kas-cip.yml:kas/board/bbb.yml:kas/opt/rt.yml:kas/opt/targz-img.yml + - scripts/deploy-cip-core.sh buster bbb base am335x-boneblack.dtb + # iwg20m + - kas build kas-cip.yml:kas/board/iwg20m.yml:kas/opt/rt.yml:kas/opt/targz-img.yml + - scripts/deploy-cip-core.sh buster iwg20m base r8a7743-iwg20d-q7-dbcm-ca.dtb + # rzg2m + - kas build kas-cip.yml:kas/board/rzg2m.yml:kas/opt/rt.yml:kas/opt/targz-img.yml + - scripts/deploy-cip-core.sh buster rzg2m base renesas/r8a774a1-hihope-rzg2m-ex.dtb + + # qemu-amd64 / security + - kas build kas-cip.yml:kas/board/qemu-amd64.yml:kas/opt/security.yml + - scripts/deploy-cip-core.sh buster qemu-amd64 security base + + # simatic-ipc227e / test + - kas build kas-cip.yml:kas/board/simatic-ipc227e.yml:kas/opt/rt.yml:kas/opt/test.yml:kas/opt/targz-img.yml + - scripts/deploy-cip-core.sh buster simatic-ipc227e test none + # bbb / test + - kas build kas-cip.yml:kas/board/bbb.yml:kas/opt/rt.yml:kas/opt/test.yml:kas/opt/targz-img.yml + - scripts/deploy-cip-core.sh buster bbb test am335x-boneblack.dtb + # iwg20m / test + - kas build kas-cip.yml:kas/board/iwg20m.yml:kas/opt/rt.yml:kas/opt/test.yml:kas/opt/targz-img.yml + - scripts/deploy-cip-core.sh buster iwg20m test r8a7743-iwg20d-q7-dbcm-ca.dtb + # rzg2m / test + - kas build kas-cip.yml:kas/board/rzg2m.yml:kas/opt/rt.yml:kas/opt/test.yml:kas/opt/targz-img.yml + - scripts/deploy-cip-core.sh buster rzg2m test renesas/r8a774a1-hihope-rzg2m-ex.dtb
Signed-off-by: Nobuhiro Iwamatsu <nobuhiro1.iwamatsu@toshiba.co.jp> --- .gitlab-ci.yml | 122 +++++++++++++------------------------------------ 1 file changed, 32 insertions(+), 90 deletions(-)