| Message ID | 20190924210106.27117-32-alex.bennee@linaro.org |
|---|---|
| State | Superseded |
| Headers | show |
| Series | testing/next (docker,tcg, alpha ;-) | expand |
On 9/24/19 11:01 PM, Alex Bennée wrote: > From: John Snow <jsnow@redhat.com> > > debian-sid is listed as a partial image, so we cannot run tests against it. > Since it isn't used by any other testable image, remove it for now as it > is prone to bitrot. > > Signed-off-by: John Snow <jsnow@redhat.com> > Message-Id: <20190923181140.7235-6-jsnow@redhat.com> > Signed-off-by: Alex Bennée <alex.bennee@linaro.org> Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com> > --- > tests/docker/Makefile.include | 2 +- > tests/docker/dockerfiles/debian-sid.docker | 35 ---------------------- > 2 files changed, 1 insertion(+), 36 deletions(-) > delete mode 100644 tests/docker/dockerfiles/debian-sid.docker > > diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include > index 053c418d8cd..180e5439ef9 100644 > --- a/tests/docker/Makefile.include > +++ b/tests/docker/Makefile.include > @@ -5,7 +5,7 @@ > DOCKER_SUFFIX := .docker > DOCKER_FILES_DIR := $(SRC_PATH)/tests/docker/dockerfiles > # we don't run tests on intermediate images (used as base by another image) > -DOCKER_PARTIAL_IMAGES := debian9 debian10 debian-sid > +DOCKER_PARTIAL_IMAGES := debian9 debian10 > DOCKER_PARTIAL_IMAGES += debian9-mxe debian-bootstrap > DOCKER_IMAGES := $(sort $(notdir $(basename $(wildcard $(DOCKER_FILES_DIR)/*.docker)))) > DOCKER_TARGETS := $(patsubst %,docker-image-%,$(DOCKER_IMAGES)) > diff --git a/tests/docker/dockerfiles/debian-sid.docker b/tests/docker/dockerfiles/debian-sid.docker > deleted file mode 100644 > index 2a1bcc33b24..00000000000 > --- a/tests/docker/dockerfiles/debian-sid.docker > +++ /dev/null > @@ -1,35 +0,0 @@ > -# > -# Debian Sid Base > -# > -# Currently we can build all our guests with cross-compilers in the > -# latest Debian release (Buster). However new compilers will first > -# arrive in Sid. However Sid is a rolling distro which may be broken > -# at any particular time. To try and mitigate this we use Debian's > -# snapshot archive which provides a "stable" view of what state Sid > -# was in. > -# > - > -# This must be earlier than the snapshot date we are aiming for > -FROM debian:sid-20190812-slim > - > - # Use a snapshot known to work (see http://snapshot.debian.org/#Usage) > -ENV DEBIAN_SNAPSHOT_DATE "20190820" > -RUN sed -i "s%^deb \(https\?://\)deb.debian.org/debian/\? \(.*\)%deb [check-valid-until=no] \1snapshot.debian.org/archive/debian/${DEBIAN_SNAPSHOT_DATE} \2%" /etc/apt/sources.list > - > -# 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 \ > - bison \ > - build-essential \ > - ca-certificates \ > - flex \ > - git \ > - pkg-config \ > - psmisc \ > - python \ > - texinfo || { echo "Failed to build - see debian-sid.docker notes"; exit 1; } >
diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include index 053c418d8cd..180e5439ef9 100644 --- a/tests/docker/Makefile.include +++ b/tests/docker/Makefile.include @@ -5,7 +5,7 @@ DOCKER_SUFFIX := .docker DOCKER_FILES_DIR := $(SRC_PATH)/tests/docker/dockerfiles # we don't run tests on intermediate images (used as base by another image) -DOCKER_PARTIAL_IMAGES := debian9 debian10 debian-sid +DOCKER_PARTIAL_IMAGES := debian9 debian10 DOCKER_PARTIAL_IMAGES += debian9-mxe debian-bootstrap DOCKER_IMAGES := $(sort $(notdir $(basename $(wildcard $(DOCKER_FILES_DIR)/*.docker)))) DOCKER_TARGETS := $(patsubst %,docker-image-%,$(DOCKER_IMAGES)) diff --git a/tests/docker/dockerfiles/debian-sid.docker b/tests/docker/dockerfiles/debian-sid.docker deleted file mode 100644 index 2a1bcc33b24..00000000000 --- a/tests/docker/dockerfiles/debian-sid.docker +++ /dev/null @@ -1,35 +0,0 @@ -# -# Debian Sid Base -# -# Currently we can build all our guests with cross-compilers in the -# latest Debian release (Buster). However new compilers will first -# arrive in Sid. However Sid is a rolling distro which may be broken -# at any particular time. To try and mitigate this we use Debian's -# snapshot archive which provides a "stable" view of what state Sid -# was in. -# - -# This must be earlier than the snapshot date we are aiming for -FROM debian:sid-20190812-slim - - # Use a snapshot known to work (see http://snapshot.debian.org/#Usage) -ENV DEBIAN_SNAPSHOT_DATE "20190820" -RUN sed -i "s%^deb \(https\?://\)deb.debian.org/debian/\? \(.*\)%deb [check-valid-until=no] \1snapshot.debian.org/archive/debian/${DEBIAN_SNAPSHOT_DATE} \2%" /etc/apt/sources.list - -# 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 \ - bison \ - build-essential \ - ca-certificates \ - flex \ - git \ - pkg-config \ - psmisc \ - python \ - texinfo || { echo "Failed to build - see debian-sid.docker notes"; exit 1; }