From: Thomas Huth <thuth@redhat.com>
To: qemu-devel@nongnu.org, "Alex Bennée" <alex.bennee@linaro.org>
Cc: "Daniel P . Berrangé" <berrange@redhat.com>,
"Eduardo Habkost" <ehabkost@redhat.com>,
"Philippe Mathieu-Daudé" <philmd@redhat.com>,
"Markus Armbruster" <armbru@redhat.com>,
"Wainer dos Santos Moschetta" <wainersm@redhat.com>,
"Cleber Rosa" <crosa@redhat.com>, "John Snow" <jsnow@redhat.com>
Subject: [PATCH 5/7] tests/docker: Remove old Debian 9 containers
Date: Mon, 21 Sep 2020 19:43:18 +0200 [thread overview]
Message-ID: <20200921174320.46062-6-thuth@redhat.com> (raw)
In-Reply-To: <20200921174320.46062-1-thuth@redhat.com>
We do not support Debian 9 in QEMU anymore, and the Debian 9 containers
are now no longer used in the gitlab-CI. Time to remove them.
Signed-off-by: Thomas Huth <thuth@redhat.com>
---
.gitlab-ci.d/containers.yml | 12 -----
.../dockerfiles/debian-win32-cross.docker | 38 ----------------
.../dockerfiles/debian-win64-cross.docker | 45 -------------------
tests/docker/dockerfiles/debian9-mxe.docker | 21 ---------
tests/docker/dockerfiles/debian9.docker | 32 -------------
5 files changed, 148 deletions(-)
delete mode 100644 tests/docker/dockerfiles/debian-win32-cross.docker
delete mode 100644 tests/docker/dockerfiles/debian-win64-cross.docker
delete mode 100644 tests/docker/dockerfiles/debian9-mxe.docker
delete mode 100644 tests/docker/dockerfiles/debian9.docker
diff --git a/.gitlab-ci.d/containers.yml b/.gitlab-ci.d/containers.yml
index 089cea7c14..11d079ea58 100644
--- a/.gitlab-ci.d/containers.yml
+++ b/.gitlab-ci.d/containers.yml
@@ -48,18 +48,6 @@ amd64-debian11-container:
variables:
NAME: debian11
-amd64-debian9-container:
- <<: *container_job_definition
- variables:
- NAME: debian9
-
-amd64-debian9-mxe-container:
- <<: *container_job_definition
- stage: containers-layer2
- needs: ['amd64-debian9-container']
- variables:
- NAME: debian9-mxe
-
alpha-debian-cross-container:
<<: *container_job_definition
stage: containers-layer2
diff --git a/tests/docker/dockerfiles/debian-win32-cross.docker b/tests/docker/dockerfiles/debian-win32-cross.docker
deleted file mode 100644
index b045e821b9..0000000000
--- a/tests/docker/dockerfiles/debian-win32-cross.docker
+++ /dev/null
@@ -1,38 +0,0 @@
-#
-# Docker mingw32 cross-compiler target
-#
-# This docker target builds on the debian Stretch MXE base image.
-#
-FROM qemu/debian9-mxe
-
-MAINTAINER Philippe Mathieu-Daudé <f4bug@amsat.org>
-
-ENV TARGET i686
-
-ENV PATH $PATH:/usr/lib/mxe/usr/bin:/usr/lib/mxe/usr/$TARGET-w64-mingw32.shared/bin
-
-ENV PKG_CONFIG_PATH \
- $PKG_CONFIG_PATH:/usr/lib/mxe/usr/$TARGET-w64-mingw32.shared/lib/pkgconfig
-
-RUN apt-get update && \
- DEBIAN_FRONTEND=noninteractive eatmydata \
- apt-get install -y --no-install-recommends \
- mxe-$TARGET-w64-mingw32.shared-bzip2 \
- mxe-$TARGET-w64-mingw32.shared-curl \
- mxe-$TARGET-w64-mingw32.shared-glib \
- mxe-$TARGET-w64-mingw32.shared-libgcrypt \
- mxe-$TARGET-w64-mingw32.shared-libusb1 \
- mxe-$TARGET-w64-mingw32.shared-lzo \
- mxe-$TARGET-w64-mingw32.shared-nettle \
- mxe-$TARGET-w64-mingw32.shared-ncurses \
- mxe-$TARGET-w64-mingw32.shared-nsis \
- mxe-$TARGET-w64-mingw32.shared-pixman \
- mxe-$TARGET-w64-mingw32.shared-pkgconf \
- mxe-$TARGET-w64-mingw32.shared-pthreads \
- mxe-$TARGET-w64-mingw32.shared-sdl2 \
- mxe-$TARGET-w64-mingw32.shared-sdl2-mixer \
- mxe-$TARGET-w64-mingw32.shared-sdl2-gfx \
- mxe-$TARGET-w64-mingw32.shared-zlib
-
-# Specify the cross prefix for this image (see tests/docker/common.rc)
-ENV QEMU_CONFIGURE_OPTS --cross-prefix=$TARGET-w64-mingw32.shared-
diff --git a/tests/docker/dockerfiles/debian-win64-cross.docker b/tests/docker/dockerfiles/debian-win64-cross.docker
deleted file mode 100644
index 4cc4a3f365..0000000000
--- a/tests/docker/dockerfiles/debian-win64-cross.docker
+++ /dev/null
@@ -1,45 +0,0 @@
-#
-# Docker mingw64 cross-compiler target
-#
-# This docker target builds on the debian Stretch MXE base image.
-#
-FROM qemu/debian9-mxe
-
-MAINTAINER Philippe Mathieu-Daudé <f4bug@amsat.org>
-
-ENV TARGET x86-64
-
-ENV PATH $PATH:/usr/lib/mxe/usr/$TARGET-w64-mingw32.shared/bin
-
-ENV PKG_CONFIG_PATH \
- $PKG_CONFIG_PATH:/usr/lib/mxe/usr/$TARGET-w64-mingw32.shared/lib/pkgconfig
-
-RUN apt-get update && \
- DEBIAN_FRONTEND=noninteractive eatmydata \
- apt-get install -y --no-install-recommends \
- mxe-$TARGET-w64-mingw32.shared-bzip2 \
- mxe-$TARGET-w64-mingw32.shared-curl \
- mxe-$TARGET-w64-mingw32.shared-glib \
- mxe-$TARGET-w64-mingw32.shared-libgcrypt \
- mxe-$TARGET-w64-mingw32.shared-libusb1 \
- mxe-$TARGET-w64-mingw32.shared-lzo \
- mxe-$TARGET-w64-mingw32.shared-nettle \
- mxe-$TARGET-w64-mingw32.shared-ncurses \
- mxe-$TARGET-w64-mingw32.shared-nsis \
- mxe-$TARGET-w64-mingw32.shared-pixman \
- mxe-$TARGET-w64-mingw32.shared-pkgconf \
- mxe-$TARGET-w64-mingw32.shared-pthreads \
- mxe-$TARGET-w64-mingw32.shared-sdl2 \
- mxe-$TARGET-w64-mingw32.shared-sdl2-mixer \
- mxe-$TARGET-w64-mingw32.shared-sdl2-gfx \
- mxe-$TARGET-w64-mingw32.shared-zlib \
- curl && \
- curl -s -S -o /usr/lib/mxe/usr/x86_64-w64-mingw32.shared/include/WinHvEmulation.h \
- "https://sourceforge.net/p/mingw-w64/mingw-w64/ci/master/tree/mingw-w64-headers/include/winhvemulation.h?format=raw" && \
- curl -s -S -o /usr/lib/mxe/usr/x86_64-w64-mingw32.shared/include/WinHvPlatform.h \
- "https://sourceforge.net/p/mingw-w64/mingw-w64/ci/master/tree/mingw-w64-headers/include/winhvplatform.h?format=raw" && \
- curl -s -S -o /usr/lib/mxe/usr/x86_64-w64-mingw32.shared/include/winhvplatformdefs.h \
- "https://sourceforge.net/p/mingw-w64/mingw-w64/ci/master/tree/mingw-w64-headers/include/winhvplatformdefs.h?format=raw"
-
-# Specify the cross prefix for this image (see tests/docker/common.rc)
-ENV QEMU_CONFIGURE_OPTS --cross-prefix=x86_64-w64-mingw32.shared-
diff --git a/tests/docker/dockerfiles/debian9-mxe.docker b/tests/docker/dockerfiles/debian9-mxe.docker
deleted file mode 100644
index ae2c222a6f..0000000000
--- a/tests/docker/dockerfiles/debian9-mxe.docker
+++ /dev/null
@@ -1,21 +0,0 @@
-#
-# Docker mingw cross-compiler target
-#
-# This docker target builds on the debian Stretch base image.
-#
-FROM qemu/debian9
-
-MAINTAINER Philippe Mathieu-Daudé <f4bug@amsat.org>
-
-RUN DEBIAN_FRONTEND=noninteractive eatmydata \
- apt install -y --no-install-recommends gnupg dirmngr
-
-# Add the foreign architecture we want and install dependencies
-RUN apt-key adv --keyserver keyserver.ubuntu.com --recv-keys C6BF758A33A3A276 && \
- echo "deb http://pkg.mxe.cc/repos/apt stretch main" > /etc/apt/sources.list.d/mxeapt.list
-RUN apt-get update && \
- DEBIAN_FRONTEND=noninteractive eatmydata \
- apt-get install -y --no-install-recommends \
- $(apt-get -s install -y --no-install-recommends gw32.shared-mingw-w64 | egrep "^Inst mxe-x86-64-unknown-" | cut -d\ -f2)
-
-ENV PATH $PATH:/usr/lib/mxe/usr/bin/
diff --git a/tests/docker/dockerfiles/debian9.docker b/tests/docker/dockerfiles/debian9.docker
deleted file mode 100644
index 3edb5147ef..0000000000
--- a/tests/docker/dockerfiles/debian9.docker
+++ /dev/null
@@ -1,32 +0,0 @@
-#
-# Docker multiarch cross-compiler target
-#
-# This docker target is builds on Debian cross compiler targets to build distro
-# with a selection of cross compilers for building test binaries.
-#
-# On its own you can't build much but the docker-foo-cross targets
-# build on top of the base debian image.
-#
-FROM debian:stretch-slim
-
-# Duplicate deb line as deb-src
-RUN cat /etc/apt/sources.list | sed "s/^deb\ /deb-src /" >> /etc/apt/sources.list
-
-# Install common build utilities
-RUN apt update && \
- DEBIAN_FRONTEND=noninteractive apt install -yy eatmydata && \
- DEBIAN_FRONTEND=noninteractive eatmydata \
- apt install -y --no-install-recommends \
- bc \
- build-essential \
- ca-certificates \
- clang \
- gdb-multiarch \
- gettext \
- git \
- libncurses5-dev \
- pkg-config \
- psmisc \
- python3 \
- python3-setuptools \
- $(apt-get -s build-dep qemu | egrep ^Inst | fgrep '[all]' | cut -d\ -f2)
--
2.18.2
next prev parent reply other threads:[~2020-09-21 17:53 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-09-21 17:43 [PATCH 0/7] Do not support Debian 9 and Python 3.5 anymore Thomas Huth
2020-09-21 17:43 ` [PATCH 1/7] tests/docker: Use Fedora containers for MinGW cross-builds in the gitlab-CI Thomas Huth
2020-09-21 18:03 ` Daniel P. Berrangé
2020-09-21 18:07 ` Thomas Huth
2020-09-22 8:21 ` Daniel P. Berrangé
2020-09-21 17:43 ` [PATCH 2/7] gitlab-ci: Remove the Debian9-based containers and containers-layer3 Thomas Huth
2020-09-21 18:05 ` Daniel P. Berrangé
2020-09-21 17:43 ` [PATCH 3/7] tests/docker: Update the tricore container to debian 10 Thomas Huth
2020-09-21 18:05 ` Daniel P. Berrangé
2020-09-22 10:35 ` Philippe Mathieu-Daudé
2020-09-21 17:43 ` [PATCH 4/7] shippable.yml: Remove the Debian9-based MinGW cross-compiler tests Thomas Huth
2020-09-21 18:07 ` Daniel P. Berrangé
2020-09-21 18:10 ` Thomas Huth
2020-09-22 10:38 ` Philippe Mathieu-Daudé
2020-09-21 17:43 ` Thomas Huth [this message]
2020-09-21 18:08 ` [PATCH 5/7] tests/docker: Remove old Debian 9 containers Daniel P. Berrangé
2020-09-22 10:39 ` Philippe Mathieu-Daudé
2020-09-21 17:43 ` [PATCH 6/7] gitlab-ci: Increase the timeout for the cross-compiler builds Thomas Huth
2020-09-21 18:09 ` Daniel P. Berrangé
2020-09-22 10:40 ` Philippe Mathieu-Daudé
2020-09-21 17:43 ` [PATCH 7/7] configure: Bump the minimum required Python version to 3.6 Thomas Huth
2020-09-21 18:04 ` John Snow
2020-09-22 10:55 ` Peter Maydell
2020-09-23 16:29 ` [PATCH v2 " Thomas Huth
2020-09-23 16:34 ` 罗勇刚(Yonggang Luo)
2020-09-23 16:44 ` Thomas Huth
2020-09-22 14:15 ` [PATCH " Markus Armbruster
2020-09-21 18:09 ` Daniel P. Berrangé
2020-09-21 18:09 ` [PATCH 0/7] Do not support Debian 9 and Python 3.5 anymore Alex Bennée
2020-09-22 7:06 ` Thomas Huth
2020-09-22 8:38 ` Alex Bennée
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200921174320.46062-6-thuth@redhat.com \
--to=thuth@redhat.com \
--cc=alex.bennee@linaro.org \
--cc=armbru@redhat.com \
--cc=berrange@redhat.com \
--cc=crosa@redhat.com \
--cc=ehabkost@redhat.com \
--cc=jsnow@redhat.com \
--cc=philmd@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=wainersm@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.