|
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [xen master] automation: upgrade Alpine build and test artifact containers to 3.18
commit 1e7f896de29f300f2373b47d50edcfb1173017ac
Author: Stefano Stabellini <stefano.stabellini@xxxxxxx>
AuthorDate: Wed Aug 9 18:18:02 2023 -0700
Commit: Stefano Stabellini <stefano.stabellini@xxxxxxx>
CommitDate: Thu Aug 10 19:28:18 2023 -0700
automation: upgrade Alpine build and test artifact containers to 3.18
Alpine 3.12 is EOL. Also update the containerize script.
Signed-off-by: Stefano Stabellini <stefano.stabellini@xxxxxxx>
Reviewed-by: Michal Orzel <michal.orzel@xxxxxxx>
---
automation/build/alpine/3.12-arm64v8.dockerfile | 48 ----------------
automation/build/alpine/3.12.dockerfile | 48 ----------------
automation/build/alpine/3.18-arm64v8.dockerfile | 48 ++++++++++++++++
automation/build/alpine/3.18.dockerfile | 48 ++++++++++++++++
automation/scripts/containerize | 4 +-
.../tests-artifacts/alpine/3.12-arm64v8.dockerfile | 66 ---------------------
automation/tests-artifacts/alpine/3.12.dockerfile | 67 ----------------------
.../tests-artifacts/alpine/3.18-arm64v8.dockerfile | 66 +++++++++++++++++++++
automation/tests-artifacts/alpine/3.18.dockerfile | 67 ++++++++++++++++++++++
9 files changed, 231 insertions(+), 231 deletions(-)
diff --git a/automation/build/alpine/3.12-arm64v8.dockerfile
b/automation/build/alpine/3.12-arm64v8.dockerfile
deleted file mode 100644
index 1be3bf7805..0000000000
--- a/automation/build/alpine/3.12-arm64v8.dockerfile
+++ /dev/null
@@ -1,48 +0,0 @@
-FROM arm64v8/alpine:3.12
-LABEL maintainer.name="The Xen Project" \
- maintainer.email="xen-devel@xxxxxxxxxxxxxxxxxxxx"
-
-ENV USER root
-
-RUN mkdir /build
-WORKDIR /build
-
-# build depends
-RUN apk --no-cache add \
- \
- # xen build deps
- argp-standalone \
- autoconf \
- bash \
- bison \
- curl \
- dev86 \
- dtc-dev \
- flex \
- gcc \
- git \
- iasl \
- libaio-dev \
- libfdt \
- linux-headers \
- make \
- musl-dev \
- ncurses-dev \
- ocaml \
- ocaml-findlib \
- patch \
- python3-dev \
- texinfo \
- util-linux-dev \
- xz-dev \
- yajl-dev \
- zlib-dev \
- \
- # qemu build deps
- glib-dev \
- libattr \
- libcap-ng-dev \
- pixman-dev \
- # qubes test deps
- openssh-client \
- fakeroot \
diff --git a/automation/build/alpine/3.12.dockerfile
b/automation/build/alpine/3.12.dockerfile
deleted file mode 100644
index 72ad3a07ad..0000000000
--- a/automation/build/alpine/3.12.dockerfile
+++ /dev/null
@@ -1,48 +0,0 @@
-FROM alpine:3.12
-LABEL maintainer.name="The Xen Project" \
- maintainer.email="xen-devel@xxxxxxxxxxxxxxxxxxxx"
-
-ENV USER root
-
-RUN mkdir /build
-WORKDIR /build
-
-# build depends
-RUN apk --no-cache add \
- \
- # xen build deps
- argp-standalone \
- autoconf \
- bash \
- bison \
- clang \
- curl \
- dev86 \
- flex \
- g++ \
- gcc \
- git \
- grep \
- iasl \
- libaio-dev \
- libc6-compat \
- linux-headers \
- make \
- musl-dev \
- ncurses-dev \
- ocaml \
- ocaml-findlib \
- patch \
- python3-dev \
- texinfo \
- util-linux-dev \
- xz-dev \
- yajl-dev \
- zlib-dev \
- \
- # qemu build deps
- glib-dev \
- libattr \
- libcap-ng-dev \
- ninja \
- pixman-dev \
diff --git a/automation/build/alpine/3.18-arm64v8.dockerfile
b/automation/build/alpine/3.18-arm64v8.dockerfile
new file mode 100644
index 0000000000..ce198f7d04
--- /dev/null
+++ b/automation/build/alpine/3.18-arm64v8.dockerfile
@@ -0,0 +1,48 @@
+FROM arm64v8/alpine:3.18
+LABEL maintainer.name="The Xen Project" \
+ maintainer.email="xen-devel@xxxxxxxxxxxxxxxxxxxx"
+
+ENV USER root
+
+RUN mkdir /build
+WORKDIR /build
+
+# build depends
+RUN apk --no-cache add \
+ \
+ # xen build deps
+ argp-standalone \
+ autoconf \
+ bash \
+ bison \
+ curl \
+ dev86 \
+ dtc-dev \
+ flex \
+ gcc \
+ git \
+ iasl \
+ libaio-dev \
+ libfdt \
+ linux-headers \
+ make \
+ musl-dev \
+ ncurses-dev \
+ ocaml \
+ ocaml-findlib \
+ patch \
+ python3-dev \
+ texinfo \
+ util-linux-dev \
+ xz-dev \
+ yajl-dev \
+ zlib-dev \
+ \
+ # qemu build deps
+ glib-dev \
+ libattr \
+ libcap-ng-dev \
+ pixman-dev \
+ # qubes test deps
+ openssh-client \
+ fakeroot \
diff --git a/automation/build/alpine/3.18.dockerfile
b/automation/build/alpine/3.18.dockerfile
new file mode 100644
index 0000000000..ca5756955e
--- /dev/null
+++ b/automation/build/alpine/3.18.dockerfile
@@ -0,0 +1,48 @@
+FROM alpine:3.18
+LABEL maintainer.name="The Xen Project" \
+ maintainer.email="xen-devel@xxxxxxxxxxxxxxxxxxxx"
+
+ENV USER root
+
+RUN mkdir /build
+WORKDIR /build
+
+# build depends
+RUN apk --no-cache add \
+ \
+ # xen build deps
+ argp-standalone \
+ autoconf \
+ bash \
+ bison \
+ clang \
+ curl \
+ dev86 \
+ flex \
+ g++ \
+ gcc \
+ git \
+ grep \
+ iasl \
+ libaio-dev \
+ libc6-compat \
+ linux-headers \
+ make \
+ musl-dev \
+ ncurses-dev \
+ ocaml \
+ ocaml-findlib \
+ patch \
+ python3-dev \
+ texinfo \
+ util-linux-dev \
+ xz-dev \
+ yajl-dev \
+ zlib-dev \
+ \
+ # qemu build deps
+ glib-dev \
+ libattr \
+ libcap-ng-dev \
+ ninja \
+ pixman-dev \
diff --git a/automation/scripts/containerize b/automation/scripts/containerize
index 6d46f63665..16d480ab75 100755
--- a/automation/scripts/containerize
+++ b/automation/scripts/containerize
@@ -24,8 +24,8 @@ die() {
#
BASE="registry.gitlab.com/xen-project/xen"
case "_${CONTAINER}" in
- _alpine) CONTAINER="${BASE}/alpine:3.12" ;;
- _alpine-arm64v8) CONTAINER="${BASE}/alpine:3.12-arm64v8" ;;
+ _alpine) CONTAINER="${BASE}/alpine:3.18" ;;
+ _alpine-arm64v8) CONTAINER="${BASE}/alpine:3.18-arm64v8" ;;
_archlinux|_arch) CONTAINER="${BASE}/archlinux:current" ;;
_riscv64) CONTAINER="${BASE}/archlinux:current-riscv64" ;;
_centos7) CONTAINER="${BASE}/centos:7" ;;
diff --git a/automation/tests-artifacts/alpine/3.12-arm64v8.dockerfile
b/automation/tests-artifacts/alpine/3.12-arm64v8.dockerfile
deleted file mode 100644
index cb8e9e59bb..0000000000
--- a/automation/tests-artifacts/alpine/3.12-arm64v8.dockerfile
+++ /dev/null
@@ -1,66 +0,0 @@
-FROM arm64v8/alpine:3.12
-LABEL maintainer.name="The Xen Project" \
- maintainer.email="xen-devel@xxxxxxxxxxxxxxxxxxxx"
-
-ENV USER root
-
-RUN mkdir /build
-WORKDIR /build
-
-RUN \
- # apk
- apk update && \
- \
- # xen runtime deps
- apk add musl && \
- apk add openrc && \
- apk add busybox && \
- apk add sudo && \
- apk add dbus && \
- apk add bash && \
- apk add python2 && \
- apk add zlib && \
- apk add ncurses && \
- apk add texinfo && \
- apk add yajl && \
- apk add libaio && \
- apk add xz-dev && \
- apk add util-linux && \
- apk add argp-standalone && \
- apk add libfdt && \
- apk add glib && \
- apk add pixman && \
- apk add curl && \
- apk add udev && \
- \
- # Xen
- cd / && \
- # Minimal ramdisk environment in case of cpio output
- rc-update add udev && \
- rc-update add udev-trigger && \
- rc-update add udev-settle && \
- rc-update add networking sysinit && \
- rc-update add loopback sysinit && \
- rc-update add bootmisc boot && \
- rc-update add devfs sysinit && \
- rc-update add dmesg sysinit && \
- rc-update add hostname boot && \
- rc-update add hwclock boot && \
- rc-update add hwdrivers sysinit && \
- rc-update add killprocs shutdown && \
- rc-update add modloop sysinit && \
- rc-update add modules boot && \
- rc-update add mount-ro shutdown && \
- rc-update add savecache shutdown && \
- rc-update add sysctl boot && \
- rc-update add local default && \
- cp -a /sbin/init /init && \
- echo "ttyS0" >> /etc/securetty && \
- echo "hvc0" >> /etc/securetty && \
- echo "ttyS0::respawn:/sbin/getty -L ttyS0 115200 vt100" >> /etc/inittab && \
- echo "hvc0::respawn:/sbin/getty -L hvc0 115200 vt100" >> /etc/inittab && \
- passwd -d "root" root && \
- \
- # Create rootfs
- cd / && \
- tar cvzf /initrd.tar.gz bin dev etc home init lib mnt opt root sbin usr var
diff --git a/automation/tests-artifacts/alpine/3.12.dockerfile
b/automation/tests-artifacts/alpine/3.12.dockerfile
deleted file mode 100644
index 073f16a0d7..0000000000
--- a/automation/tests-artifacts/alpine/3.12.dockerfile
+++ /dev/null
@@ -1,67 +0,0 @@
-FROM alpine:3.12
-LABEL maintainer.name="The Xen Project" \
- maintainer.email="xen-devel@xxxxxxxxxxxxxxxxxxxx"
-
-ENV USER root
-
-RUN mkdir /build
-WORKDIR /build
-
-RUN \
- # apk
- apk update && \
- \
- # xen runtime deps
- apk add musl && \
- apk add libgcc && \
- apk add openrc && \
- apk add busybox && \
- apk add sudo && \
- apk add dbus && \
- apk add bash && \
- apk add python2 && \
- apk add zlib && \
- apk add ncurses && \
- apk add texinfo && \
- apk add yajl && \
- apk add libaio && \
- apk add xz-dev && \
- apk add util-linux && \
- apk add argp-standalone && \
- apk add libfdt && \
- apk add glib && \
- apk add pixman && \
- apk add curl && \
- apk add udev && \
- \
- # Xen
- cd / && \
- # Minimal ramdisk environment in case of cpio output
- rc-update add udev && \
- rc-update add udev-trigger && \
- rc-update add udev-settle && \
- rc-update add networking sysinit && \
- rc-update add loopback sysinit && \
- rc-update add bootmisc boot && \
- rc-update add devfs sysinit && \
- rc-update add dmesg sysinit && \
- rc-update add hostname boot && \
- rc-update add hwclock boot && \
- rc-update add hwdrivers sysinit && \
- rc-update add killprocs shutdown && \
- rc-update add modloop sysinit && \
- rc-update add modules boot && \
- rc-update add mount-ro shutdown && \
- rc-update add savecache shutdown && \
- rc-update add sysctl boot && \
- rc-update add local default && \
- cp -a /sbin/init /init && \
- echo "ttyS0" >> /etc/securetty && \
- echo "hvc0" >> /etc/securetty && \
- echo "ttyS0::respawn:/sbin/getty -L ttyS0 115200 vt100" >> /etc/inittab && \
- echo "hvc0::respawn:/sbin/getty -L hvc0 115200 vt100" >> /etc/inittab && \
- passwd -d "root" root && \
- \
- # Create rootfs
- cd / && \
- tar cvzf /initrd.tar.gz bin dev etc home init lib mnt opt root sbin usr var
diff --git a/automation/tests-artifacts/alpine/3.18-arm64v8.dockerfile
b/automation/tests-artifacts/alpine/3.18-arm64v8.dockerfile
new file mode 100644
index 0000000000..cbd96d9bc6
--- /dev/null
+++ b/automation/tests-artifacts/alpine/3.18-arm64v8.dockerfile
@@ -0,0 +1,66 @@
+FROM arm64v8/alpine:3.18
+LABEL maintainer.name="The Xen Project" \
+ maintainer.email="xen-devel@xxxxxxxxxxxxxxxxxxxx"
+
+ENV USER root
+
+RUN mkdir /build
+WORKDIR /build
+
+RUN \
+ # apk
+ apk update && \
+ \
+ # xen runtime deps
+ apk add musl && \
+ apk add openrc && \
+ apk add busybox && \
+ apk add sudo && \
+ apk add dbus && \
+ apk add bash && \
+ apk add python3 && \
+ apk add zlib && \
+ apk add ncurses && \
+ apk add texinfo && \
+ apk add yajl && \
+ apk add libaio && \
+ apk add xz-dev && \
+ apk add util-linux && \
+ apk add argp-standalone && \
+ apk add libfdt && \
+ apk add glib && \
+ apk add pixman && \
+ apk add curl && \
+ apk add udev && \
+ \
+ # Xen
+ cd / && \
+ # Minimal ramdisk environment in case of cpio output
+ rc-update add udev && \
+ rc-update add udev-trigger && \
+ rc-update add udev-settle && \
+ rc-update add networking sysinit && \
+ rc-update add loopback sysinit && \
+ rc-update add bootmisc boot && \
+ rc-update add devfs sysinit && \
+ rc-update add dmesg sysinit && \
+ rc-update add hostname boot && \
+ rc-update add hwclock boot && \
+ rc-update add hwdrivers sysinit && \
+ rc-update add killprocs shutdown && \
+ rc-update add modloop sysinit && \
+ rc-update add modules boot && \
+ rc-update add mount-ro shutdown && \
+ rc-update add savecache shutdown && \
+ rc-update add sysctl boot && \
+ rc-update add local default && \
+ cp -a /sbin/init /init && \
+ echo "ttyS0" >> /etc/securetty && \
+ echo "hvc0" >> /etc/securetty && \
+ echo "ttyS0::respawn:/sbin/getty -L ttyS0 115200 vt100" >> /etc/inittab && \
+ echo "hvc0::respawn:/sbin/getty -L hvc0 115200 vt100" >> /etc/inittab && \
+ passwd -d "root" root && \
+ \
+ # Create rootfs
+ cd / && \
+ tar cvzf /initrd.tar.gz bin dev etc home init lib mnt opt root sbin usr var
diff --git a/automation/tests-artifacts/alpine/3.18.dockerfile
b/automation/tests-artifacts/alpine/3.18.dockerfile
new file mode 100644
index 0000000000..32aa8e1778
--- /dev/null
+++ b/automation/tests-artifacts/alpine/3.18.dockerfile
@@ -0,0 +1,67 @@
+FROM alpine:3.18
+LABEL maintainer.name="The Xen Project" \
+ maintainer.email="xen-devel@xxxxxxxxxxxxxxxxxxxx"
+
+ENV USER root
+
+RUN mkdir /build
+WORKDIR /build
+
+RUN \
+ # apk
+ apk update && \
+ \
+ # xen runtime deps
+ apk add musl && \
+ apk add libgcc && \
+ apk add openrc && \
+ apk add busybox && \
+ apk add sudo && \
+ apk add dbus && \
+ apk add bash && \
+ apk add python3 && \
+ apk add zlib && \
+ apk add ncurses && \
+ apk add texinfo && \
+ apk add yajl && \
+ apk add libaio && \
+ apk add xz-dev && \
+ apk add util-linux && \
+ apk add argp-standalone && \
+ apk add libfdt && \
+ apk add glib && \
+ apk add pixman && \
+ apk add curl && \
+ apk add udev && \
+ \
+ # Xen
+ cd / && \
+ # Minimal ramdisk environment in case of cpio output
+ rc-update add udev && \
+ rc-update add udev-trigger && \
+ rc-update add udev-settle && \
+ rc-update add networking sysinit && \
+ rc-update add loopback sysinit && \
+ rc-update add bootmisc boot && \
+ rc-update add devfs sysinit && \
+ rc-update add dmesg sysinit && \
+ rc-update add hostname boot && \
+ rc-update add hwclock boot && \
+ rc-update add hwdrivers sysinit && \
+ rc-update add killprocs shutdown && \
+ rc-update add modloop sysinit && \
+ rc-update add modules boot && \
+ rc-update add mount-ro shutdown && \
+ rc-update add savecache shutdown && \
+ rc-update add sysctl boot && \
+ rc-update add local default && \
+ cp -a /sbin/init /init && \
+ echo "ttyS0" >> /etc/securetty && \
+ echo "hvc0" >> /etc/securetty && \
+ echo "ttyS0::respawn:/sbin/getty -L ttyS0 115200 vt100" >> /etc/inittab && \
+ echo "hvc0::respawn:/sbin/getty -L hvc0 115200 vt100" >> /etc/inittab && \
+ passwd -d "root" root && \
+ \
+ # Create rootfs
+ cd / && \
+ tar cvzf /initrd.tar.gz bin dev etc home init lib mnt opt root sbin usr var
--
generated by git-patchbot for /home/xen/git/xen.git#master
|
 |
Lists.xenproject.org is hosted with RackSpace, monitoring our |