| Message ID | 20230217152556.516948-4-Quirin.Gylstorff@siemens.com (mailing list archive) |
|---|---|
| State | Accepted |
| Headers | show |
| Series | Enable Images based on Debian 12 | expand |
On 17.02.23 16:25, Quirin Gylstorff wrote: > From: Quirin Gylstorff <quirin.gylstorff@siemens.com> > > Signed-off-by: Quirin Gylstorff <quirin.gylstorff@siemens.com> > --- > .gitlab-ci.yml | 15 +++++++++++++++ > 1 file changed, 15 insertions(+) > > diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml > index 311702f..95adad5 100644 > --- a/.gitlab-ci.yml > +++ b/.gitlab-ci.yml > @@ -38,6 +38,7 @@ default: > - if [ "${release}" = "buster" ]; then base_yaml="${base_yaml}:kas/opt/buster.yml"; fi > - if [ "${release}" = "bullseye" ]; then base_yaml="${base_yaml}:kas/opt/bullseye.yml"; fi > - if [ "${release}" = "bookworm" ]; then base_yaml="${base_yaml}:kas/opt/bookworm.yml"; fi > + - if [ "${release}" = "sid-ports" ]; then base_yaml="${base_yaml}:kas/opt/sid-ports.yml"; fi > - 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 > @@ -326,3 +327,17 @@ build:qemu-amd64-secure-boot-bookworm: > use_rt: disable > wic_targz: disable > deploy: disable > + > +# riscV > + > +build:qemu-risv64: > + extends: > + - .build_base > + variables: > + base_yaml: "kas-cip.yml:kas/board/${target}.yml" > + release: sid-ports > + target: qemu-riscv64 > + use_rt: disable > + wic_targz: disable > + deploy: disable > + This will run against snapshot.d.o, and I'm concerned about both duration and stability of such runs. That's why I left if off so far. Jan
On 2/17/23 16:33, Jan Kiszka wrote: > On 17.02.23 16:25, Quirin Gylstorff wrote: >> From: Quirin Gylstorff <quirin.gylstorff@siemens.com> >> >> Signed-off-by: Quirin Gylstorff <quirin.gylstorff@siemens.com> >> --- >> .gitlab-ci.yml | 15 +++++++++++++++ >> 1 file changed, 15 insertions(+) >> >> diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml >> index 311702f..95adad5 100644 >> --- a/.gitlab-ci.yml >> +++ b/.gitlab-ci.yml >> @@ -38,6 +38,7 @@ default: >> - if [ "${release}" = "buster" ]; then base_yaml="${base_yaml}:kas/opt/buster.yml"; fi >> - if [ "${release}" = "bullseye" ]; then base_yaml="${base_yaml}:kas/opt/bullseye.yml"; fi >> - if [ "${release}" = "bookworm" ]; then base_yaml="${base_yaml}:kas/opt/bookworm.yml"; fi >> + - if [ "${release}" = "sid-ports" ]; then base_yaml="${base_yaml}:kas/opt/sid-ports.yml"; fi >> - 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 >> @@ -326,3 +327,17 @@ build:qemu-amd64-secure-boot-bookworm: >> use_rt: disable >> wic_targz: disable >> deploy: disable >> + >> +# riscV >> + >> +build:qemu-risv64: >> + extends: >> + - .build_base >> + variables: >> + base_yaml: "kas-cip.yml:kas/board/${target}.yml" >> + release: sid-ports >> + target: qemu-riscv64 >> + use_rt: disable >> + wic_targz: disable >> + deploy: disable >> + > > This will run against snapshot.d.o, and I'm concerned about both > duration and stability of such runs. That's why I left if off so far. > I would like to have a build for riscv64. We could add something like this: rules: - changes: - conf/machine/qemu-riscv64.conf - conf/distro/*sid* Quirin > Jan >
On 17.02.23 19:16, Gylstorff Quirin wrote: > > > On 2/17/23 16:33, Jan Kiszka wrote: >> On 17.02.23 16:25, Quirin Gylstorff wrote: >>> From: Quirin Gylstorff <quirin.gylstorff@siemens.com> >>> >>> Signed-off-by: Quirin Gylstorff <quirin.gylstorff@siemens.com> >>> --- >>> .gitlab-ci.yml | 15 +++++++++++++++ >>> 1 file changed, 15 insertions(+) >>> >>> diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml >>> index 311702f..95adad5 100644 >>> --- a/.gitlab-ci.yml >>> +++ b/.gitlab-ci.yml >>> @@ -38,6 +38,7 @@ default: >>> - if [ "${release}" = "buster" ]; then >>> base_yaml="${base_yaml}:kas/opt/buster.yml"; fi >>> - if [ "${release}" = "bullseye" ]; then >>> base_yaml="${base_yaml}:kas/opt/bullseye.yml"; fi >>> - if [ "${release}" = "bookworm" ]; then >>> base_yaml="${base_yaml}:kas/opt/bookworm.yml"; fi >>> + - if [ "${release}" = "sid-ports" ]; then >>> base_yaml="${base_yaml}:kas/opt/sid-ports.yml"; fi >>> - 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 >>> @@ -326,3 +327,17 @@ build:qemu-amd64-secure-boot-bookworm: >>> use_rt: disable >>> wic_targz: disable >>> deploy: disable >>> + >>> +# riscV >>> + >>> +build:qemu-risv64: >>> + extends: >>> + - .build_base >>> + variables: >>> + base_yaml: "kas-cip.yml:kas/board/${target}.yml" >>> + release: sid-ports >>> + target: qemu-riscv64 >>> + use_rt: disable >>> + wic_targz: disable >>> + deploy: disable >>> + >> >> This will run against snapshot.d.o, and I'm concerned about both >> duration and stability of such runs. That's why I left if off so far. >> > I would like to have a build for riscv64. We could add something like this: > > rules: > - changes: > - conf/machine/qemu-riscv64.conf > - conf/distro/*sid* But how would that help? It would only build on changes to files that are generally not touched. Did you try a riscv64 build in our cluster? How long does it take? Jan
On 2/17/23 19:57, Jan Kiszka wrote: > On 17.02.23 19:16, Gylstorff Quirin wrote: >> >> >> On 2/17/23 16:33, Jan Kiszka wrote: >>> On 17.02.23 16:25, Quirin Gylstorff wrote: >>>> From: Quirin Gylstorff <quirin.gylstorff@siemens.com> >>>> >>>> Signed-off-by: Quirin Gylstorff <quirin.gylstorff@siemens.com> >>>> --- >>>> .gitlab-ci.yml | 15 +++++++++++++++ >>>> 1 file changed, 15 insertions(+) >>>> >>>> diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml >>>> index 311702f..95adad5 100644 >>>> --- a/.gitlab-ci.yml >>>> +++ b/.gitlab-ci.yml >>>> @@ -38,6 +38,7 @@ default: >>>> - if [ "${release}" = "buster" ]; then >>>> base_yaml="${base_yaml}:kas/opt/buster.yml"; fi >>>> - if [ "${release}" = "bullseye" ]; then >>>> base_yaml="${base_yaml}:kas/opt/bullseye.yml"; fi >>>> - if [ "${release}" = "bookworm" ]; then >>>> base_yaml="${base_yaml}:kas/opt/bookworm.yml"; fi >>>> + - if [ "${release}" = "sid-ports" ]; then >>>> base_yaml="${base_yaml}:kas/opt/sid-ports.yml"; fi >>>> - 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 >>>> @@ -326,3 +327,17 @@ build:qemu-amd64-secure-boot-bookworm: >>>> use_rt: disable >>>> wic_targz: disable >>>> deploy: disable >>>> + >>>> +# riscV >>>> + >>>> +build:qemu-risv64: >>>> + extends: >>>> + - .build_base >>>> + variables: >>>> + base_yaml: "kas-cip.yml:kas/board/${target}.yml" >>>> + release: sid-ports >>>> + target: qemu-riscv64 >>>> + use_rt: disable >>>> + wic_targz: disable >>>> + deploy: disable >>>> + >>> >>> This will run against snapshot.d.o, and I'm concerned about both >>> duration and stability of such runs. That's why I left if off so far. >>> >> I would like to have a build for riscv64. We could add something like this: >> >> rules: >> - changes: >> - conf/machine/qemu-riscv64.conf >> - conf/distro/*sid* > > But how would that help? It would only build on changes to files that > are generally not touched. This was more as an example as the correct rules. Another m > > Did you try a riscv64 build in our cluster? How long does it take? The execution time of the pipeline increased from around 48min to 73min. Quirin
On 17.02.23 16:25, Quirin Gylstorff wrote: > From: Quirin Gylstorff <quirin.gylstorff@siemens.com> > > Signed-off-by: Quirin Gylstorff <quirin.gylstorff@siemens.com> > --- > .gitlab-ci.yml | 15 +++++++++++++++ > 1 file changed, 15 insertions(+) > > diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml > index 311702f..95adad5 100644 > --- a/.gitlab-ci.yml > +++ b/.gitlab-ci.yml > @@ -38,6 +38,7 @@ default: > - if [ "${release}" = "buster" ]; then base_yaml="${base_yaml}:kas/opt/buster.yml"; fi > - if [ "${release}" = "bullseye" ]; then base_yaml="${base_yaml}:kas/opt/bullseye.yml"; fi > - if [ "${release}" = "bookworm" ]; then base_yaml="${base_yaml}:kas/opt/bookworm.yml"; fi > + - if [ "${release}" = "sid-ports" ]; then base_yaml="${base_yaml}:kas/opt/sid-ports.yml"; fi > - 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 > @@ -326,3 +327,17 @@ build:qemu-amd64-secure-boot-bookworm: > use_rt: disable > wic_targz: disable > deploy: disable > + > +# riscV > + > +build:qemu-risv64: > + extends: > + - .build_base > + variables: > + base_yaml: "kas-cip.yml:kas/board/${target}.yml" > + release: sid-ports > + target: qemu-riscv64 > + use_rt: disable > + wic_targz: disable > + deploy: disable > + I'm taking this already. Rebased it and simplified the variables list. Thanks, Jan
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 311702f..95adad5 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -38,6 +38,7 @@ default: - if [ "${release}" = "buster" ]; then base_yaml="${base_yaml}:kas/opt/buster.yml"; fi - if [ "${release}" = "bullseye" ]; then base_yaml="${base_yaml}:kas/opt/bullseye.yml"; fi - if [ "${release}" = "bookworm" ]; then base_yaml="${base_yaml}:kas/opt/bookworm.yml"; fi + - if [ "${release}" = "sid-ports" ]; then base_yaml="${base_yaml}:kas/opt/sid-ports.yml"; fi - 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 @@ -326,3 +327,17 @@ build:qemu-amd64-secure-boot-bookworm: use_rt: disable wic_targz: disable deploy: disable + +# riscV + +build:qemu-risv64: + extends: + - .build_base + variables: + base_yaml: "kas-cip.yml:kas/board/${target}.yml" + release: sid-ports + target: qemu-riscv64 + use_rt: disable + wic_targz: disable + deploy: disable +