|
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [xen staging] CI: Use pipefail in scripts/build
commit fdc202394568dea45367359a9a8dc7c8b45622e6
Author: Andrew Cooper <andrew.cooper3@xxxxxxxxxx>
AuthorDate: Fri Sep 12 09:55:55 2025 +0100
Commit: Andrew Cooper <andrew.cooper3@xxxxxxxxxx>
CommitDate: Sat Sep 13 01:02:28 2025 +0100
CI: Use pipefail in scripts/build
Marek noticed that some builds were failing with:
+ cd dist/install
+ find
+ cpio -R 0:0 -o -H newc
./automation/scripts/build: line 111: cpio: command not found
+ gzip
but succeeding overall, and producing a zero length xen-tools.cpio.gz as an
artefact.
In fact, it's all of:
archlinux:current
debian:12-x86_32
fedora:41
opensuse:tumbleweed
ubuntu (all versions)
Add cpio into all of these containers, including opensuse leap for good
measure, and use pipefail in the build script.
Fixes: 4611ae6fb8f9 ("CI: save toolstack artifact as cpio.gz")
Reported-by: Marek Marczykowski-Górecki <marmarek@xxxxxxxxxxxxxxxxxxxxxx>
Signed-off-by: Andrew Cooper <andrew.cooper3@xxxxxxxxxx>
Reviewed-by: Denis Mukhin <dmukhin@xxxxxxxx>
Acked-by: Stefano Stabellini <sstabellini@xxxxxxxxxx>
---
automation/build/archlinux/current.dockerfile | 1 +
automation/build/debian/12-x86_32.dockerfile | 1 +
automation/build/fedora/41-x86_64.dockerfile | 1 +
automation/build/opensuse/leap-15.6-x86_64.dockerfile | 1 +
automation/build/opensuse/tumbleweed-x86_64.dockerfile | 1 +
automation/build/ubuntu/16.04-x86_64.dockerfile | 1 +
automation/build/ubuntu/18.04-x86_64.dockerfile | 1 +
automation/build/ubuntu/20.04-x86_64.dockerfile | 1 +
automation/build/ubuntu/22.04-x86_64.dockerfile | 1 +
automation/build/ubuntu/24.04-x86_64.dockerfile | 1 +
automation/scripts/build | 2 ++
11 files changed, 12 insertions(+)
diff --git a/automation/build/archlinux/current.dockerfile
b/automation/build/archlinux/current.dockerfile
index 657ddd77a8..4e53c835fa 100644
--- a/automation/build/archlinux/current.dockerfile
+++ b/automation/build/archlinux/current.dockerfile
@@ -8,6 +8,7 @@ RUN pacman-key --init
RUN pacman -S --refresh --sysupgrade --noconfirm --noprogressbar --needed \
bridge-utils \
bzip2 \
+ cpio \
discount \
dtc \
e2fsprogs \
diff --git a/automation/build/debian/12-x86_32.dockerfile
b/automation/build/debian/12-x86_32.dockerfile
index ef7a257155..447152d7e5 100644
--- a/automation/build/debian/12-x86_32.dockerfile
+++ b/automation/build/debian/12-x86_32.dockerfile
@@ -23,6 +23,7 @@ RUN <<EOF
# Tools (general)
ca-certificates
+ cpio
git-core
pkg-config
wget
diff --git a/automation/build/fedora/41-x86_64.dockerfile
b/automation/build/fedora/41-x86_64.dockerfile
index 8032a20986..e33329aedc 100644
--- a/automation/build/fedora/41-x86_64.dockerfile
+++ b/automation/build/fedora/41-x86_64.dockerfile
@@ -23,6 +23,7 @@ RUN <<EOF
checkpolicy
# Tools (general)
+ cpio
git-core
gzip
patch
diff --git a/automation/build/opensuse/leap-15.6-x86_64.dockerfile
b/automation/build/opensuse/leap-15.6-x86_64.dockerfile
index 97890dfc00..33db3ecd63 100644
--- a/automation/build/opensuse/leap-15.6-x86_64.dockerfile
+++ b/automation/build/opensuse/leap-15.6-x86_64.dockerfile
@@ -29,6 +29,7 @@ RUN <<EOF
python311
# Tools (general)
+ cpio
git-core
gzip
patch
diff --git a/automation/build/opensuse/tumbleweed-x86_64.dockerfile
b/automation/build/opensuse/tumbleweed-x86_64.dockerfile
index 61e840fc67..218bc45294 100644
--- a/automation/build/opensuse/tumbleweed-x86_64.dockerfile
+++ b/automation/build/opensuse/tumbleweed-x86_64.dockerfile
@@ -28,6 +28,7 @@ RUN <<EOF
python3
# Tools (general)
+ cpio
git-core
gzip
patch
diff --git a/automation/build/ubuntu/16.04-x86_64.dockerfile
b/automation/build/ubuntu/16.04-x86_64.dockerfile
index 9cc8ca89e8..72a46389fa 100644
--- a/automation/build/ubuntu/16.04-x86_64.dockerfile
+++ b/automation/build/ubuntu/16.04-x86_64.dockerfile
@@ -24,6 +24,7 @@ RUN <<EOF
# Tools (general)
ca-certificates
+ cpio
git-core
gzip
patch
diff --git a/automation/build/ubuntu/18.04-x86_64.dockerfile
b/automation/build/ubuntu/18.04-x86_64.dockerfile
index aefe52125a..2634856c89 100644
--- a/automation/build/ubuntu/18.04-x86_64.dockerfile
+++ b/automation/build/ubuntu/18.04-x86_64.dockerfile
@@ -24,6 +24,7 @@ RUN <<EOF
# Tools (general)
ca-certificates
+ cpio
git-core
gzip
patch
diff --git a/automation/build/ubuntu/20.04-x86_64.dockerfile
b/automation/build/ubuntu/20.04-x86_64.dockerfile
index 1ee20a13ac..9ec57eb975 100644
--- a/automation/build/ubuntu/20.04-x86_64.dockerfile
+++ b/automation/build/ubuntu/20.04-x86_64.dockerfile
@@ -24,6 +24,7 @@ RUN <<EOF
# Tools (general)
ca-certificates
+ cpio
git-core
gzip
patch
diff --git a/automation/build/ubuntu/22.04-x86_64.dockerfile
b/automation/build/ubuntu/22.04-x86_64.dockerfile
index a9a9b84930..6ae7f4faa8 100644
--- a/automation/build/ubuntu/22.04-x86_64.dockerfile
+++ b/automation/build/ubuntu/22.04-x86_64.dockerfile
@@ -24,6 +24,7 @@ RUN <<EOF
# Tools (general)
ca-certificates
+ cpio
git-core
gzip
patch
diff --git a/automation/build/ubuntu/24.04-x86_64.dockerfile
b/automation/build/ubuntu/24.04-x86_64.dockerfile
index 2005723b31..84777d188c 100644
--- a/automation/build/ubuntu/24.04-x86_64.dockerfile
+++ b/automation/build/ubuntu/24.04-x86_64.dockerfile
@@ -24,6 +24,7 @@ RUN <<EOF
# Tools (general)
ca-certificates
+ cpio
git-core
gzip
patch
diff --git a/automation/scripts/build b/automation/scripts/build
index d0511843e7..7a81d229de 100755
--- a/automation/scripts/build
+++ b/automation/scripts/build
@@ -1,5 +1,7 @@
#!/bin/bash -ex
+set -o pipefail
+
test -f /etc/os-release && cat "$_"
# Construct $cc such that it matches what `make` will chose when taking
--
generated by git-patchbot for /home/xen/git/xen.git#staging
|
 |
Lists.xenproject.org is hosted with RackSpace, monitoring our |