[PATCH v1] automation: add findutils to suse images

Olaf Hering posted 1 patch 3 months, 2 weeks ago
Failed in applying to current master (apply log)
automation/build/suse/opensuse-leap.dockerfile       | 1 +
automation/build/suse/opensuse-tumbleweed.dockerfile | 1 +
2 files changed, 2 insertions(+)
[PATCH v1] automation: add findutils to suse images
Posted by Olaf Hering 3 months, 2 weeks ago
The build system uses find(1). Make sure it is available.

Signed-off-by: Olaf Hering <olaf@aepfle.de>
---
 automation/build/suse/opensuse-leap.dockerfile       | 1 +
 automation/build/suse/opensuse-tumbleweed.dockerfile | 1 +
 2 files changed, 2 insertions(+)

diff --git a/automation/build/suse/opensuse-leap.dockerfile b/automation/build/suse/opensuse-leap.dockerfile
index 3ef33458a0..1344cbb0d1 100644
--- a/automation/build/suse/opensuse-leap.dockerfile
+++ b/automation/build/suse/opensuse-leap.dockerfile
@@ -20,6 +20,7 @@ RUN zypper install -y --no-recommends \
         dev86 \
         diffutils \
         discount \
+        findutils \
         flex \
         gawk \
         gcc \
diff --git a/automation/build/suse/opensuse-tumbleweed.dockerfile b/automation/build/suse/opensuse-tumbleweed.dockerfile
index a793601c87..2587a3fa4f 100644
--- a/automation/build/suse/opensuse-tumbleweed.dockerfile
+++ b/automation/build/suse/opensuse-tumbleweed.dockerfile
@@ -18,6 +18,7 @@ RUN zypper install -y --no-recommends \
         cmake \
         diffutils \
         discount \
+        findutils \
         flex \
         gawk \
         gcc \
Re: [PATCH v1] automation: add findutils to suse images
Posted by Andrew Cooper 3 months, 2 weeks ago
On 01/07/2024 4:15 pm, Olaf Hering wrote:
> The build system uses find(1). Make sure it is available.
>
> Signed-off-by: Olaf Hering <olaf@aepfle.de>

Acked-by: Andrew Cooper <andrew.cooper3@citrix.com>

CC Oleksii.  This is probably non-optional to take.

I suspect it means we can't rebuild the OpenSUSE dockerfiles any more...

~Andrew

> ---
>  automation/build/suse/opensuse-leap.dockerfile       | 1 +
>  automation/build/suse/opensuse-tumbleweed.dockerfile | 1 +
>  2 files changed, 2 insertions(+)
>
> diff --git a/automation/build/suse/opensuse-leap.dockerfile b/automation/build/suse/opensuse-leap.dockerfile
> index 3ef33458a0..1344cbb0d1 100644
> --- a/automation/build/suse/opensuse-leap.dockerfile
> +++ b/automation/build/suse/opensuse-leap.dockerfile
> @@ -20,6 +20,7 @@ RUN zypper install -y --no-recommends \
>          dev86 \
>          diffutils \
>          discount \
> +        findutils \
>          flex \
>          gawk \
>          gcc \
> diff --git a/automation/build/suse/opensuse-tumbleweed.dockerfile b/automation/build/suse/opensuse-tumbleweed.dockerfile
> index a793601c87..2587a3fa4f 100644
> --- a/automation/build/suse/opensuse-tumbleweed.dockerfile
> +++ b/automation/build/suse/opensuse-tumbleweed.dockerfile
> @@ -18,6 +18,7 @@ RUN zypper install -y --no-recommends \
>          cmake \
>          diffutils \
>          discount \
> +        findutils \
>          flex \
>          gawk \
>          gcc \
>


Re: [PATCH v1] automation: add findutils to suse images
Posted by Oleksii 3 months, 2 weeks ago
On Mon, 2024-07-01 at 16:20 +0100, Andrew Cooper wrote:
> On 01/07/2024 4:15 pm, Olaf Hering wrote:
> > The build system uses find(1). Make sure it is available.
> > 
> > Signed-off-by: Olaf Hering <olaf@aepfle.de>
> 
> Acked-by: Andrew Cooper <andrew.cooper3@citrix.com>
> 
> CC Oleksii.  This is probably non-optional to take.
> 
> I suspect it means we can't rebuild the OpenSUSE dockerfiles any
> more...
Are we going to rebuild the OpenSUSE dockerfiles in this release?

~ Oleksii
> 
> > ---
> >  automation/build/suse/opensuse-leap.dockerfile       | 1 +
> >  automation/build/suse/opensuse-tumbleweed.dockerfile | 1 +
> >  2 files changed, 2 insertions(+)
> > 
> > diff --git a/automation/build/suse/opensuse-leap.dockerfile
> > b/automation/build/suse/opensuse-leap.dockerfile
> > index 3ef33458a0..1344cbb0d1 100644
> > --- a/automation/build/suse/opensuse-leap.dockerfile
> > +++ b/automation/build/suse/opensuse-leap.dockerfile
> > @@ -20,6 +20,7 @@ RUN zypper install -y --no-recommends \
> >          dev86 \
> >          diffutils \
> >          discount \
> > +        findutils \
> >          flex \
> >          gawk \
> >          gcc \
> > diff --git a/automation/build/suse/opensuse-tumbleweed.dockerfile
> > b/automation/build/suse/opensuse-tumbleweed.dockerfile
> > index a793601c87..2587a3fa4f 100644
> > --- a/automation/build/suse/opensuse-tumbleweed.dockerfile
> > +++ b/automation/build/suse/opensuse-tumbleweed.dockerfile
> > @@ -18,6 +18,7 @@ RUN zypper install -y --no-recommends \
> >          cmake \
> >          diffutils \
> >          discount \
> > +        findutils \
> >          flex \
> >          gawk \
> >          gcc \
> > 
> 
Re: [PATCH v1] automation: add findutils to suse images
Posted by Andrew Cooper 3 months, 2 weeks ago
On 02/07/2024 10:56 am, Oleksii wrote:
> On Mon, 2024-07-01 at 16:20 +0100, Andrew Cooper wrote:
>> On 01/07/2024 4:15 pm, Olaf Hering wrote:
>>> The build system uses find(1). Make sure it is available.
>>>
>>> Signed-off-by: Olaf Hering <olaf@aepfle.de>
>> Acked-by: Andrew Cooper <andrew.cooper3@citrix.com>
>>
>> CC Oleksii.  This is probably non-optional to take.
>>
>> I suspect it means we can't rebuild the OpenSUSE dockerfiles any
>> more...
> Are we going to rebuild the OpenSUSE dockerfiles in this release?

They get rebuilt at arbitrary points.

This patch is about keeping Gitlab CI running smoothly.  It's not
related to Xen 4.19, except by chance.

~Andrew

Re: [PATCH v1] automation: add findutils to suse images
Posted by Olaf Hering 3 months, 2 weeks ago
Tue, 2 Jul 2024 11:02:00 +0100 Andrew Cooper <andrew.cooper3@citrix.com>:

> This patch is about keeping Gitlab CI running smoothly.  It's not
> related to Xen 4.19, except by chance.

It seems the automation/build directory needs to be purged from
non-staging branches, to make it obvious that images need to be
rebuilt from the staging branch only.


Olaf
Re: [PATCH v1] automation: add findutils to suse images
Posted by Andrew Cooper 3 months, 2 weeks ago
On 02/07/2024 11:11 am, Olaf Hering wrote:
> Tue, 2 Jul 2024 11:02:00 +0100 Andrew Cooper <andrew.cooper3@citrix.com>:
>
>> This patch is about keeping Gitlab CI running smoothly.  It's not
>> related to Xen 4.19, except by chance.
> It seems the automation/build directory needs to be purged from
> non-staging branches, to make it obvious that images need to be
> rebuilt from the staging branch only.

In an ideal world, yes.  Sadly there's one problem.

It breaks the use of ./automation/scripts/containerize locally in the
older branches.

~Andrew