| Message ID | 20220106111614.218823-5-alice.ferrazzi@miraclelinux.com (mailing list archive) |
|---|---|
| State | Handled Elsewhere |
| Headers | show |
| Series | Add cip-core-image-kernelci building and uploading system | expand |
On 06.01.22 12:16, Alice Ferrazzi wrote: > enable CIP core image KernelCI to be built with gitlab pipeline > and uploaded to the KernelCI storage using KernelCI API. > enable cip-core-image-kernelci to be built for amd64, arm and arm64. > > Signed-off-by: Alice Ferrazzi <alice.ferrazzi@miraclelinux.com> > --- > .gitlab-ci.yml | 40 +++++++++++++++++++++++++++++++++++++++- > 1 file changed, 39 insertions(+), 1 deletion(-) > > diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml > index e7db8c1..784343b 100644 > --- a/.gitlab-ci.yml > +++ b/.gitlab-ci.yml > @@ -9,6 +9,7 @@ variables: > targz: disable > dtb: none > deploy: enable > + deploy_kernelci: disable > > stages: > - build > @@ -37,7 +38,8 @@ default: > - if [ "${release}" = "bullseye" ]; then base_yaml="${base_yaml}:kas/opt/bullseye.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 > + - if [ "${deploy}" = "enable" ]; then scripts/deploy-cip-core.sh ${release} ${target} ${extension} ${dtb} ${CI_COMMIT_REF_SLUG}; fi; > + - if [ "${deploy_kernelci}" = "enable" ]; then scripts/deploy-kernelci.py ${release} ${target} ${extension} ${dtb}; fi Does gitlab-ci forces us to add that closing ; to the last-but-one command? If so, better add it to the new from the beginning. Jan
On Thu, Jan 6, 2022 at 11:12 PM Jan Kiszka <jan.kiszka@siemens.com> wrote: > > On 06.01.22 12:16, Alice Ferrazzi wrote: > > enable CIP core image KernelCI to be built with gitlab pipeline > > and uploaded to the KernelCI storage using KernelCI API. > > enable cip-core-image-kernelci to be built for amd64, arm and arm64. > > > > Signed-off-by: Alice Ferrazzi <alice.ferrazzi@miraclelinux.com> > > --- > > .gitlab-ci.yml | 40 +++++++++++++++++++++++++++++++++++++++- > > 1 file changed, 39 insertions(+), 1 deletion(-) > > > > diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml > > index e7db8c1..784343b 100644 > > --- a/.gitlab-ci.yml > > +++ b/.gitlab-ci.yml > > @@ -9,6 +9,7 @@ variables: > > targz: disable > > dtb: none > > deploy: enable > > + deploy_kernelci: disable > > > > stages: > > - build > > @@ -37,7 +38,8 @@ default: > > - if [ "${release}" = "bullseye" ]; then base_yaml="${base_yaml}:kas/opt/bullseye.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 > > + - if [ "${deploy}" = "enable" ]; then scripts/deploy-cip-core.sh ${release} ${target} ${extension} ${dtb} ${CI_COMMIT_REF_SLUG}; fi; > > + - if [ "${deploy_kernelci}" = "enable" ]; then scripts/deploy-kernelci.py ${release} ${target} ${extension} ${dtb}; fi > > Does gitlab-ci forces us to add that closing ; to the last-but-one > command? If so, better add it to the new from the beginning. > I'm just following the syntax that is already there. The gitlab-ci.yml file syntax preceding my commit is also doing same thing of adding that closing ; to the last-but-one command. You can check it here https://gitlab.com/cip-project/cip-core/isar-cip-core/-/blob/master/.gitlab-ci.yml#L40 Thanks, Alice
On 07.01.22 11:02, Alice Ferrazzi wrote: > On Thu, Jan 6, 2022 at 11:12 PM Jan Kiszka <jan.kiszka@siemens.com> wrote: >> >> On 06.01.22 12:16, Alice Ferrazzi wrote: >>> enable CIP core image KernelCI to be built with gitlab pipeline >>> and uploaded to the KernelCI storage using KernelCI API. >>> enable cip-core-image-kernelci to be built for amd64, arm and arm64. >>> >>> Signed-off-by: Alice Ferrazzi <alice.ferrazzi@miraclelinux.com> >>> --- >>> .gitlab-ci.yml | 40 +++++++++++++++++++++++++++++++++++++++- >>> 1 file changed, 39 insertions(+), 1 deletion(-) >>> >>> diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml >>> index e7db8c1..784343b 100644 >>> --- a/.gitlab-ci.yml >>> +++ b/.gitlab-ci.yml >>> @@ -9,6 +9,7 @@ variables: >>> targz: disable >>> dtb: none >>> deploy: enable >>> + deploy_kernelci: disable >>> >>> stages: >>> - build >>> @@ -37,7 +38,8 @@ default: >>> - if [ "${release}" = "bullseye" ]; then base_yaml="${base_yaml}:kas/opt/bullseye.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 >>> + - if [ "${deploy}" = "enable" ]; then scripts/deploy-cip-core.sh ${release} ${target} ${extension} ${dtb} ${CI_COMMIT_REF_SLUG}; fi; >>> + - if [ "${deploy_kernelci}" = "enable" ]; then scripts/deploy-kernelci.py ${release} ${target} ${extension} ${dtb}; fi >> >> Does gitlab-ci forces us to add that closing ; to the last-but-one >> command? If so, better add it to the new from the beginning. >> > > I'm just following the syntax that is already there. > The gitlab-ci.yml file syntax preceding my commit is also doing same > thing of adding that closing ; to the last-but-one command. > You can check it here > https://gitlab.com/cip-project/cip-core/isar-cip-core/-/blob/master/.gitlab-ci.yml#L40 > Then, if the closing semicolon is needed, add it to the new line as well to avoid having to touch that when adding the next one. Jan
On Fri, Jan 7, 2022 at 7:07 PM Jan Kiszka <jan.kiszka@siemens.com> wrote: > > On 07.01.22 11:02, Alice Ferrazzi wrote: > > On Thu, Jan 6, 2022 at 11:12 PM Jan Kiszka <jan.kiszka@siemens.com> wrote: > >> > >> On 06.01.22 12:16, Alice Ferrazzi wrote: > >>> enable CIP core image KernelCI to be built with gitlab pipeline > >>> and uploaded to the KernelCI storage using KernelCI API. > >>> enable cip-core-image-kernelci to be built for amd64, arm and arm64. > >>> > >>> Signed-off-by: Alice Ferrazzi <alice.ferrazzi@miraclelinux.com> > >>> --- > >>> .gitlab-ci.yml | 40 +++++++++++++++++++++++++++++++++++++++- > >>> 1 file changed, 39 insertions(+), 1 deletion(-) > >>> > >>> diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml > >>> index e7db8c1..784343b 100644 > >>> --- a/.gitlab-ci.yml > >>> +++ b/.gitlab-ci.yml > >>> @@ -9,6 +9,7 @@ variables: > >>> targz: disable > >>> dtb: none > >>> deploy: enable > >>> + deploy_kernelci: disable > >>> > >>> stages: > >>> - build > >>> @@ -37,7 +38,8 @@ default: > >>> - if [ "${release}" = "bullseye" ]; then base_yaml="${base_yaml}:kas/opt/bullseye.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 > >>> + - if [ "${deploy}" = "enable" ]; then scripts/deploy-cip-core.sh ${release} ${target} ${extension} ${dtb} ${CI_COMMIT_REF_SLUG}; fi; > >>> + - if [ "${deploy_kernelci}" = "enable" ]; then scripts/deploy-kernelci.py ${release} ${target} ${extension} ${dtb}; fi > >> > >> Does gitlab-ci forces us to add that closing ; to the last-but-one > >> command? If so, better add it to the new from the beginning. > >> > > > > I'm just following the syntax that is already there. > > The gitlab-ci.yml file syntax preceding my commit is also doing same > > thing of adding that closing ; to the last-but-one command. > > You can check it here > > https://gitlab.com/cip-project/cip-core/isar-cip-core/-/blob/master/.gitlab-ci.yml#L40 > > > > Then, if the closing semicolon is needed, add it to the new line as well > to avoid having to touch that when adding the next one. sorry I'm not understanding what you want me to do. The closing semicolon is needed to the last-but-one command. Adding it to the last command break the script.
On 07.01.22 11:23, Alice Ferrazzi wrote: > On Fri, Jan 7, 2022 at 7:07 PM Jan Kiszka <jan.kiszka@siemens.com> wrote: >> >> On 07.01.22 11:02, Alice Ferrazzi wrote: >>> On Thu, Jan 6, 2022 at 11:12 PM Jan Kiszka <jan.kiszka@siemens.com> wrote: >>>> >>>> On 06.01.22 12:16, Alice Ferrazzi wrote: >>>>> enable CIP core image KernelCI to be built with gitlab pipeline >>>>> and uploaded to the KernelCI storage using KernelCI API. >>>>> enable cip-core-image-kernelci to be built for amd64, arm and arm64. >>>>> >>>>> Signed-off-by: Alice Ferrazzi <alice.ferrazzi@miraclelinux.com> >>>>> --- >>>>> .gitlab-ci.yml | 40 +++++++++++++++++++++++++++++++++++++++- >>>>> 1 file changed, 39 insertions(+), 1 deletion(-) >>>>> >>>>> diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml >>>>> index e7db8c1..784343b 100644 >>>>> --- a/.gitlab-ci.yml >>>>> +++ b/.gitlab-ci.yml >>>>> @@ -9,6 +9,7 @@ variables: >>>>> targz: disable >>>>> dtb: none >>>>> deploy: enable >>>>> + deploy_kernelci: disable >>>>> >>>>> stages: >>>>> - build >>>>> @@ -37,7 +38,8 @@ default: >>>>> - if [ "${release}" = "bullseye" ]; then base_yaml="${base_yaml}:kas/opt/bullseye.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 >>>>> + - if [ "${deploy}" = "enable" ]; then scripts/deploy-cip-core.sh ${release} ${target} ${extension} ${dtb} ${CI_COMMIT_REF_SLUG}; fi; >>>>> + - if [ "${deploy_kernelci}" = "enable" ]; then scripts/deploy-kernelci.py ${release} ${target} ${extension} ${dtb}; fi >>>> >>>> Does gitlab-ci forces us to add that closing ; to the last-but-one >>>> command? If so, better add it to the new from the beginning. >>>> >>> >>> I'm just following the syntax that is already there. >>> The gitlab-ci.yml file syntax preceding my commit is also doing same >>> thing of adding that closing ; to the last-but-one command. >>> You can check it here >>> https://gitlab.com/cip-project/cip-core/isar-cip-core/-/blob/master/.gitlab-ci.yml#L40 >>> >> >> Then, if the closing semicolon is needed, add it to the new line as well >> to avoid having to touch that when adding the next one. > > sorry I'm not understanding what you want me to do. > The closing semicolon is needed to the last-but-one command. > Adding it to the last command break the script. > Are you really sure about the closing semicolon? https://gitlab.com/jan-kiszka/ci-test/-/jobs/1951623081 https://gitlab.com/jan-kiszka/ci-test/-/blob/semicolon/.gitlab-ci.yml Jan
On Fri, Jan 7, 2022 at 8:18 PM Jan Kiszka <jan.kiszka@siemens.com> wrote: > > On 07.01.22 11:23, Alice Ferrazzi wrote: > > On Fri, Jan 7, 2022 at 7:07 PM Jan Kiszka <jan.kiszka@siemens.com> wrote: > >> > >> On 07.01.22 11:02, Alice Ferrazzi wrote: > >>> On Thu, Jan 6, 2022 at 11:12 PM Jan Kiszka <jan.kiszka@siemens.com> wrote: > >>>> > >>>> On 06.01.22 12:16, Alice Ferrazzi wrote: > >>>>> enable CIP core image KernelCI to be built with gitlab pipeline > >>>>> and uploaded to the KernelCI storage using KernelCI API. > >>>>> enable cip-core-image-kernelci to be built for amd64, arm and arm64. > >>>>> > >>>>> Signed-off-by: Alice Ferrazzi <alice.ferrazzi@miraclelinux.com> > >>>>> --- > >>>>> .gitlab-ci.yml | 40 +++++++++++++++++++++++++++++++++++++++- > >>>>> 1 file changed, 39 insertions(+), 1 deletion(-) > >>>>> > >>>>> diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml > >>>>> index e7db8c1..784343b 100644 > >>>>> --- a/.gitlab-ci.yml > >>>>> +++ b/.gitlab-ci.yml > >>>>> @@ -9,6 +9,7 @@ variables: > >>>>> targz: disable > >>>>> dtb: none > >>>>> deploy: enable > >>>>> + deploy_kernelci: disable > >>>>> > >>>>> stages: > >>>>> - build > >>>>> @@ -37,7 +38,8 @@ default: > >>>>> - if [ "${release}" = "bullseye" ]; then base_yaml="${base_yaml}:kas/opt/bullseye.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 > >>>>> + - if [ "${deploy}" = "enable" ]; then scripts/deploy-cip-core.sh ${release} ${target} ${extension} ${dtb} ${CI_COMMIT_REF_SLUG}; fi; > >>>>> + - if [ "${deploy_kernelci}" = "enable" ]; then scripts/deploy-kernelci.py ${release} ${target} ${extension} ${dtb}; fi > >>>> > >>>> Does gitlab-ci forces us to add that closing ; to the last-but-one > >>>> command? If so, better add it to the new from the beginning. > >>>> > >>> > >>> I'm just following the syntax that is already there. > >>> The gitlab-ci.yml file syntax preceding my commit is also doing same > >>> thing of adding that closing ; to the last-but-one command. > >>> You can check it here > >>> https://gitlab.com/cip-project/cip-core/isar-cip-core/-/blob/master/.gitlab-ci.yml#L40 > >>> > >> > >> Then, if the closing semicolon is needed, add it to the new line as well > >> to avoid having to touch that when adding the next one. > > > > sorry I'm not understanding what you want me to do. > > The closing semicolon is needed to the last-but-one command. > > Adding it to the last command break the script. > > > > Are you really sure about the closing semicolon? > > https://gitlab.com/jan-kiszka/ci-test/-/jobs/1951623081 > https://gitlab.com/jan-kiszka/ci-test/-/blob/semicolon/.gitlab-ci.yml you are right. I just checked my pipeline backlog and found that some months ago, I just checked for both without ; and not the case of both having it. Still we are changing the syntax already present and used. is it ok to use a new syntax? if is ok I can send a revision. Thanks, Alicef
On 07.01.22 14:40, Alice Ferrazzi wrote: > On Fri, Jan 7, 2022 at 8:18 PM Jan Kiszka <jan.kiszka@siemens.com> wrote: >> >> On 07.01.22 11:23, Alice Ferrazzi wrote: >>> On Fri, Jan 7, 2022 at 7:07 PM Jan Kiszka <jan.kiszka@siemens.com> wrote: >>>> >>>> On 07.01.22 11:02, Alice Ferrazzi wrote: >>>>> On Thu, Jan 6, 2022 at 11:12 PM Jan Kiszka <jan.kiszka@siemens.com> wrote: >>>>>> >>>>>> On 06.01.22 12:16, Alice Ferrazzi wrote: >>>>>>> enable CIP core image KernelCI to be built with gitlab pipeline >>>>>>> and uploaded to the KernelCI storage using KernelCI API. >>>>>>> enable cip-core-image-kernelci to be built for amd64, arm and arm64. >>>>>>> >>>>>>> Signed-off-by: Alice Ferrazzi <alice.ferrazzi@miraclelinux.com> >>>>>>> --- >>>>>>> .gitlab-ci.yml | 40 +++++++++++++++++++++++++++++++++++++++- >>>>>>> 1 file changed, 39 insertions(+), 1 deletion(-) >>>>>>> >>>>>>> diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml >>>>>>> index e7db8c1..784343b 100644 >>>>>>> --- a/.gitlab-ci.yml >>>>>>> +++ b/.gitlab-ci.yml >>>>>>> @@ -9,6 +9,7 @@ variables: >>>>>>> targz: disable >>>>>>> dtb: none >>>>>>> deploy: enable >>>>>>> + deploy_kernelci: disable >>>>>>> >>>>>>> stages: >>>>>>> - build >>>>>>> @@ -37,7 +38,8 @@ default: >>>>>>> - if [ "${release}" = "bullseye" ]; then base_yaml="${base_yaml}:kas/opt/bullseye.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 >>>>>>> + - if [ "${deploy}" = "enable" ]; then scripts/deploy-cip-core.sh ${release} ${target} ${extension} ${dtb} ${CI_COMMIT_REF_SLUG}; fi; >>>>>>> + - if [ "${deploy_kernelci}" = "enable" ]; then scripts/deploy-kernelci.py ${release} ${target} ${extension} ${dtb}; fi >>>>>> >>>>>> Does gitlab-ci forces us to add that closing ; to the last-but-one >>>>>> command? If so, better add it to the new from the beginning. >>>>>> >>>>> >>>>> I'm just following the syntax that is already there. >>>>> The gitlab-ci.yml file syntax preceding my commit is also doing same >>>>> thing of adding that closing ; to the last-but-one command. >>>>> You can check it here >>>>> https://gitlab.com/cip-project/cip-core/isar-cip-core/-/blob/master/.gitlab-ci.yml#L40 >>>>> >>>> >>>> Then, if the closing semicolon is needed, add it to the new line as well >>>> to avoid having to touch that when adding the next one. >>> >>> sorry I'm not understanding what you want me to do. >>> The closing semicolon is needed to the last-but-one command. >>> Adding it to the last command break the script. >>> >> >> Are you really sure about the closing semicolon? >> >> https://gitlab.com/jan-kiszka/ci-test/-/jobs/1951623081 >> https://gitlab.com/jan-kiszka/ci-test/-/blob/semicolon/.gitlab-ci.yml > > you are right. I just checked my pipeline backlog and found that some > months ago, > I just checked for both without ; and not the case of both having it. > Still we are changing the syntax already present and used. > is it ok to use a new syntax? if is ok I can send a revision. > I've sent a patch that removes the superfluous semicolons, you were on CC. Just rebase on top and follow that new pattern. Thanks, Jan
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index e7db8c1..784343b 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -9,6 +9,7 @@ variables: targz: disable dtb: none deploy: enable + deploy_kernelci: disable stages: - build @@ -37,7 +38,8 @@ default: - if [ "${release}" = "bullseye" ]; then base_yaml="${base_yaml}:kas/opt/bullseye.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 + - if [ "${deploy}" = "enable" ]; then scripts/deploy-cip-core.sh ${release} ${target} ${extension} ${dtb} ${CI_COMMIT_REF_SLUG}; fi; + - if [ "${deploy_kernelci}" = "enable" ]; then scripts/deploy-kernelci.py ${release} ${target} ${extension} ${dtb}; fi # base image build:simatic-ipc227e-base: @@ -77,6 +79,18 @@ build:qemu-amd64-base: wic_targz: disable targz: enable +build:qemu-amd64-base-kernelci: + extends: + - .build_base + variables: + target: qemu-amd64 + extension: kernelci + use_rt: disable + wic_targz: disable + targz: enable + deploy: disable + deploy_kernelci: enable + build:qemu-arm64-base: extends: - .build_base @@ -87,6 +101,18 @@ build:qemu-arm64-base: wic_targz: disable targz: enable +build:qemu-arm64-base-kernelci: + extends: + - .build_base + variables: + target: qemu-arm64 + extension: kernelci + use_rt: disable + wic_targz: disable + targz: enable + deploy: disable + deploy_kernelci: enable + build:qemu-arm-base: extends: - .build_base @@ -97,6 +123,18 @@ build:qemu-arm-base: wic_targz: disable targz: enable +build:qemu-arm-base-kernelci: + extends: + - .build_base + variables: + target: qemu-arm + extension: kernelci + use_rt: disable + wic_targz: disable + targz: enable + deploy: disable + deploy_kernelci: enable + # test build:simatic-ipc227e-test: extends:
enable CIP core image KernelCI to be built with gitlab pipeline and uploaded to the KernelCI storage using KernelCI API. enable cip-core-image-kernelci to be built for amd64, arm and arm64. Signed-off-by: Alice Ferrazzi <alice.ferrazzi@miraclelinux.com> --- .gitlab-ci.yml | 40 +++++++++++++++++++++++++++++++++++++++- 1 file changed, 39 insertions(+), 1 deletion(-)