Skip to contentSkip to conversation

automation: add findutils to suse images

PATCH In review Olaf Hering 3 participants 6 messages Jul 1, 2024 – Jul 2, 2024

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 automation: add findutils to suse images

The build system uses find(1). Make sure it is available.

---
 automation/build/suse/opensuse-leap.dockerfile       | 1 +
 automation/build/suse/opensuse-tumbleweed.dockerfile | 1 +
 2 files changed, 2 insertions(+)
automation/build/suse/opensuse-leap.dockerfile +1 -0
index 3ef33458a0..1344cbb0d1 100644
@@ -20,6 +20,7 @@ RUN zypper install -y --no-recommends \
         dev86 \
         diffutils \
         discount \
+        findutils \
         flex \
         gawk \
         gcc \
automation/build/suse/opensuse-tumbleweed.dockerfile +1 -0
index a793601c87..2587a3fa4f 100644
@@ -18,6 +18,7 @@ RUN zypper install -y --no-recommends \
         cmake \
         diffutils \
         discount \
+        findutils \
         flex \
         gawk \
         gcc \
Acked-by on v1 1/1
#1 lore raw
Quoted 3 lines · Olaf Hering

The build system uses find(1). Make sure it is available.

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

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

~Andrew

Quoted 30 lines
---
 automation/build/suse/opensuse-leap.dockerfile       | 1 +
 automation/build/suse/opensuse-tumbleweed.dockerfile | 1 +
 2 files changed, 2 insertions(+)
automation/build/suse/opensuse-leap.dockerfile +1 -0
index 3ef33458a0..1344cbb0d1 100644
@@ -20,6 +20,7 @@ RUN zypper install -y --no-recommends \
         dev86 \
         diffutils \
         discount \
+        findutils \
         flex \
         gawk \
         gcc \
automation/build/suse/opensuse-tumbleweed.dockerfile +1 -0
index a793601c87..2587a3fa4f 100644
@@ -18,6 +18,7 @@ RUN zypper install -y --no-recommends \
         cmake \
         diffutils \
         discount \
+        findutils \
         flex \
         gawk \
         gcc \
#2 lore raw
Quoted 11 lines · Andrew Cooper
Quoted 3 lines · Olaf Hering

The build system uses find(1). Make sure it is available.

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

Quoted 34 lines
Quoted 33 lines

---
 automation/build/suse/opensuse-leap.dockerfile       | 1 + automation/build/suse/opensuse-tumbleweed.dockerfile | 1 +

 2 files changed, 2 insertions(+)
automation/build/suse/opensuse-leap.dockerfile +1 -0
index 3ef33458a0..1344cbb0d1 100644
@@ -20,6 +20,7 @@ RUN zypper install -y --no-recommends \
          dev86 \
          diffutils \
          discount \
+        findutils \
          flex \
          gawk \
          gcc \
automation/build/suse/opensuse-tumbleweed.dockerfile +1 -0
index a793601c87..2587a3fa4f 100644
@@ -18,6 +18,7 @@ RUN zypper install -y --no-recommends \
          cmake \
          diffutils \
          discount \
+        findutils \
          flex \
          gawk \
          gcc \
#3 lore raw
Quoted 4 lines · Oleksii
Quoted 3 lines · Andrew Cooper
Quoted 2 lines · Olaf Hering

The build system uses find(1). Make sure it is available.

Quoted 8 lines
Quoted 7 lines
Quoted 1 line

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

#4 lore raw

Tue, 2 Jul 2024 11:02:00 +0100 Andrew Cooper <[email protected]>:

Quoted 2 lines

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

#5 lore raw
Quoted 7 lines · Olaf Hering

Tue, 2 Jul 2024 11:02:00 +0100 Andrew Cooper <[email protected]>:

Quoted 2 lines

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