[PATCH] CI: Add Ocaml to the alpine containers

[PATCH] CI: Add Ocaml to the alpine containers

[Andrew Cooper]

This gets more coverage of optional parts of the build, and makes it easier to
trial Ocaml related changes in the smoke tests.

Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>
---
CC: Roger Pau Monné <roger.pau@citrix.com>
CC: Stefano Stabellini <sstabellini@kernel.org>
CC: Michal Orzel <michal.orzel@amd.com>
CC: Anthony PERARD <anthony.perard@citrix.com>

Hacked up manually to fix the Ocaml bindings for arm64:

  https://gitlab.com/xen-project/people/andyhhp/xen/-/pipelines/895162017

but this aspect should be done irrespective.
---
 automation/build/alpine/3.12-arm64v8.dockerfile | 2 ++
 automation/build/alpine/3.12.dockerfile         | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/automation/build/alpine/3.12-arm64v8.dockerfile b/automation/build/alpine/3.12-arm64v8.dockerfile
index 3f1e6a3fc6df..1be3bf780509 100644
--- a/automation/build/alpine/3.12-arm64v8.dockerfile
+++ b/automation/build/alpine/3.12-arm64v8.dockerfile
@@ -28,6 +28,8 @@ RUN apk --no-cache add \
   make \
   musl-dev  \
   ncurses-dev \
+  ocaml \
+  ocaml-findlib \
   patch  \
   python3-dev \
   texinfo \
diff --git a/automation/build/alpine/3.12.dockerfile b/automation/build/alpine/3.12.dockerfile
index c847aa82d9e2..72ad3a07ad4a 100644
--- a/automation/build/alpine/3.12.dockerfile
+++ b/automation/build/alpine/3.12.dockerfile
@@ -30,6 +30,8 @@ RUN apk --no-cache add \
   make \
   musl-dev  \
   ncurses-dev \
+  ocaml \
+  ocaml-findlib \
   patch  \
   python3-dev \
   texinfo \

base-commit: 3a82e4501c4ec4d53b764c5b69955997b03d1137
-- 
2.30.2

Re: [PATCH] CI: Add Ocaml to the alpine containers

[Michal Orzel]

On 09/06/2023 18:02, Andrew Cooper wrote:
> 
> 
> This gets more coverage of optional parts of the build, and makes it easier to
> trial Ocaml related changes in the smoke tests.
> 
> Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>
> ---
> CC: Roger Pau Monné <roger.pau@citrix.com>
> CC: Stefano Stabellini <sstabellini@kernel.org>
> CC: Michal Orzel <michal.orzel@amd.com>
> CC: Anthony PERARD <anthony.perard@citrix.com>
> 
> Hacked up manually to fix the Ocaml bindings for arm64:
> 
>   https://gitlab.com/xen-project/people/andyhhp/xen/-/pipelines/895162017
> 
> but this aspect should be done irrespective.
> ---
>  automation/build/alpine/3.12-arm64v8.dockerfile | 2 ++
>  automation/build/alpine/3.12.dockerfile         | 2 ++
>  2 files changed, 4 insertions(+)
> 
> diff --git a/automation/build/alpine/3.12-arm64v8.dockerfile b/automation/build/alpine/3.12-arm64v8.dockerfile
> index 3f1e6a3fc6df..1be3bf780509 100644
> --- a/automation/build/alpine/3.12-arm64v8.dockerfile
> +++ b/automation/build/alpine/3.12-arm64v8.dockerfile
> @@ -28,6 +28,8 @@ RUN apk --no-cache add \
>    make \
>    musl-dev  \
>    ncurses-dev \
> +  ocaml \
> +  ocaml-findlib \
I can see that in your CI pipeline, this package is missing. Is it then necessary to be added?
Asking just out of curiosity because other containers have it installed too.

Apart from that, I can confirm that containers can be built without issues, so:
Reviewed-by: Michal Orzel <michal.orzel@amd.com>

~Michal

Re: [PATCH] CI: Add Ocaml to the alpine containers

[Andrew Cooper]

On 09/06/2023 5:21 pm, Michal Orzel wrote:
> On 09/06/2023 18:02, Andrew Cooper wrote:
>> This gets more coverage of optional parts of the build, and makes it easier to
>> trial Ocaml related changes in the smoke tests.
>>
>> Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>
>> ---
>> CC: Roger Pau Monné <roger.pau@citrix.com>
>> CC: Stefano Stabellini <sstabellini@kernel.org>
>> CC: Michal Orzel <michal.orzel@amd.com>
>> CC: Anthony PERARD <anthony.perard@citrix.com>
>>
>> Hacked up manually to fix the Ocaml bindings for arm64:
>>
>>   https://gitlab.com/xen-project/people/andyhhp/xen/-/pipelines/895162017
>>
>> but this aspect should be done irrespective.
>> ---
>>  automation/build/alpine/3.12-arm64v8.dockerfile | 2 ++
>>  automation/build/alpine/3.12.dockerfile         | 2 ++
>>  2 files changed, 4 insertions(+)
>>
>> diff --git a/automation/build/alpine/3.12-arm64v8.dockerfile b/automation/build/alpine/3.12-arm64v8.dockerfile
>> index 3f1e6a3fc6df..1be3bf780509 100644
>> --- a/automation/build/alpine/3.12-arm64v8.dockerfile
>> +++ b/automation/build/alpine/3.12-arm64v8.dockerfile
>> @@ -28,6 +28,8 @@ RUN apk --no-cache add \
>>    make \
>>    musl-dev  \
>>    ncurses-dev \
>> +  ocaml \
>> +  ocaml-findlib \
> I can see that in your CI pipeline, this package is missing. Is it then necessary to be added?
> Asking just out of curiosity because other containers have it installed too.
>
> Apart from that, I can confirm that containers can be built without issues, so:
> Reviewed-by: Michal Orzel <michal.orzel@amd.com>

Thanks.  It is necessary, yes.

I missed it the first time around, and deployed updated container to
rerun the failed job, rather than pushing a full new branch.

I'm unsure why the opensuse containers have ocaml-ocamlbuild and
ocaml-ocamldoc too, but that can be a mystery for another day.

~Andrew

Re: [PATCH] CI: Add Ocaml to the alpine containers

[Stefano Stabellini]

[-- Attachment #1: Type: text/plain, Size: 1651 bytes --]

On Fri, 9 Jun 2023, Michal Orzel wrote:
> On 09/06/2023 18:02, Andrew Cooper wrote:
> > 
> > 
> > This gets more coverage of optional parts of the build, and makes it easier to
> > trial Ocaml related changes in the smoke tests.
> > 
> > Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>
> > ---
> > CC: Roger Pau Monné <roger.pau@citrix.com>
> > CC: Stefano Stabellini <sstabellini@kernel.org>
> > CC: Michal Orzel <michal.orzel@amd.com>
> > CC: Anthony PERARD <anthony.perard@citrix.com>
> > 
> > Hacked up manually to fix the Ocaml bindings for arm64:
> > 
> >   https://gitlab.com/xen-project/people/andyhhp/xen/-/pipelines/895162017
> > 
> > but this aspect should be done irrespective.
> > ---
> >  automation/build/alpine/3.12-arm64v8.dockerfile | 2 ++
> >  automation/build/alpine/3.12.dockerfile         | 2 ++
> >  2 files changed, 4 insertions(+)
> > 
> > diff --git a/automation/build/alpine/3.12-arm64v8.dockerfile b/automation/build/alpine/3.12-arm64v8.dockerfile
> > index 3f1e6a3fc6df..1be3bf780509 100644
> > --- a/automation/build/alpine/3.12-arm64v8.dockerfile
> > +++ b/automation/build/alpine/3.12-arm64v8.dockerfile
> > @@ -28,6 +28,8 @@ RUN apk --no-cache add \
> >    make \
> >    musl-dev  \
> >    ncurses-dev \
> > +  ocaml \
> > +  ocaml-findlib \
> I can see that in your CI pipeline, this package is missing. Is it then necessary to be added?
> Asking just out of curiosity because other containers have it installed too.
> 
> Apart from that, I can confirm that containers can be built without issues, so:
> Reviewed-by: Michal Orzel <michal.orzel@amd.com>

Acked-by: Stefano Stabellini <sstabellini@kernel.org>