mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

tests/docker: change tag naming scheme of our images

Browse Source 
We've been misusing the tag naming scheme for some time by overloading
the post : section with the image type. Really it should be saved for
the revision of that particular build. Move the details to the other
side so we have:

  qemu/image-name

with the implied :latest version added by the tooling.

Suggested-by: Daniel P. Berrangé <berrange@redhat.com>
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>

Message-Id: <20200701135652.1366-18-alex.bennee@linaro.org>
This commit is contained in:
Alex Bennée 2020-07-01 14:56:29 +01:00
parent 10c927dcc5
commit 767b6bd22b
28 changed files with 34 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.shippable.yml
View File

@ -29,8 +29,8 @@ build:
pre_ci: pre_ci:
- make docker-image-${IMAGE} V=1 - make docker-image-${IMAGE} V=1
pre_ci_boot: pre_ci_boot:
image_name: qemu image_name: qemu/${IMAGE}
image_tag: ${IMAGE} image_tag: latest
pull: false pull: false
options: "-e HOME=/root" options: "-e HOME=/root"
ci: ci:

10
tests/docker/Makefile.include
View File

@ -50,12 +50,12 @@ docker-image: ${DOCKER_TARGETS}
ifdef SKIP_DOCKER_BUILD ifdef SKIP_DOCKER_BUILD
docker-image-%: $(DOCKER_FILES_DIR)/%.docker docker-image-%: $(DOCKER_FILES_DIR)/%.docker
$(call quiet-command, \ $(call quiet-command, \
$(DOCKER_SCRIPT) check --quiet qemu:$* $<, \ $(DOCKER_SCRIPT) check --quiet qemu/$* $<, \
"CHECK", "$*") "CHECK", "$*")
else else
docker-image-%: $(DOCKER_FILES_DIR)/%.docker docker-image-%: $(DOCKER_FILES_DIR)/%.docker
$(call quiet-command,\ $(call quiet-command,\
$(DOCKER_SCRIPT) build -t qemu:$* -f $< \ $(DOCKER_SCRIPT) build -t qemu/$* -f $< \
$(if $V,,--quiet) $(if $(NOCACHE),--no-cache) \ $(if $V,,--quiet) $(if $(NOCACHE),--no-cache) \
$(if $(NOUSER),,--add-current-user) \ $(if $(NOUSER),,--add-current-user) \
$(if $(EXTRA_FILES),--extra-files $(EXTRA_FILES))\ $(if $(EXTRA_FILES),--extra-files $(EXTRA_FILES))\
@ -75,14 +75,14 @@ docker-binfmt-image-debian-%: $(DOCKER_FILES_DIR)/debian-bootstrap.docker
DEB_ARCH=$(DEB_ARCH) \ DEB_ARCH=$(DEB_ARCH) \
DEB_TYPE=$(DEB_TYPE) \ DEB_TYPE=$(DEB_TYPE) \
$(if $(DEB_URL),DEB_URL=$(DEB_URL),) \ $(if $(DEB_URL),DEB_URL=$(DEB_URL),) \
$(DOCKER_SCRIPT) build qemu:debian-$* $< \ $(DOCKER_SCRIPT) build qemu/debian-$* $< \
$(if $V,,--quiet) $(if $(NOCACHE),--no-cache) \ $(if $V,,--quiet) $(if $(NOCACHE),--no-cache) \
$(if $(NOUSER),,--add-current-user) \ $(if $(NOUSER),,--add-current-user) \
$(if $(EXTRA_FILES),--extra-files $(EXTRA_FILES)) \ $(if $(EXTRA_FILES),--extra-files $(EXTRA_FILES)) \
$(if $(EXECUTABLE),--include-executable=$(EXECUTABLE)), \ $(if $(EXECUTABLE),--include-executable=$(EXECUTABLE)), \
"BUILD","binfmt debian-$* (debootstrapped)"), \ "BUILD","binfmt debian-$* (debootstrapped)"), \
$(call quiet-command, \ $(call quiet-command, \
$(DOCKER_SCRIPT) check --quiet qemu:debian-$* $< || \ $(DOCKER_SCRIPT) check --quiet qemu/debian-$* $< || \
{ echo "You will need to build $(EXECUTABLE)"; exit 1;},\ { echo "You will need to build $(EXECUTABLE)"; exit 1;},\
"CHECK", "debian-$* exists")) "CHECK", "debian-$* exists"))
@ -258,7 +258,7 @@ docker-run: docker-qemu-src
docker-run-%: CMD = $(shell echo '$@' | sed -e 's/docker-run-\([^@]*\)@\(.*\)/\1/') docker-run-%: CMD = $(shell echo '$@' | sed -e 's/docker-run-\([^@]*\)@\(.*\)/\1/')
docker-run-%: IMAGE = $(shell echo '$@' | sed -e 's/docker-run-\([^@]*\)@\(.*\)/\2/') docker-run-%: IMAGE = $(shell echo '$@' | sed -e 's/docker-run-\([^@]*\)@\(.*\)/\2/')
docker-run-%: docker-run-%:
@$(MAKE) docker-run TEST=$(CMD) IMAGE=qemu:$(IMAGE) @$(MAKE) docker-run TEST=$(CMD) IMAGE=qemu/$(IMAGE)
docker-clean: docker-clean:
$(call quiet-command, $(DOCKER_SCRIPT) clean) $(call quiet-command, $(DOCKER_SCRIPT) clean)

2
tests/docker/docker.py
View File

@ -204,7 +204,7 @@ def _dockerfile_preprocess(df):
for l in df.splitlines(): for l in df.splitlines():
if len(l.strip()) == 0 or l.startswith("#"): if len(l.strip()) == 0 or l.startswith("#"):
continue continue
from_pref = "FROM qemu:" from_pref = "FROM qemu/"
if l.startswith(from_pref): if l.startswith(from_pref):
# TODO: Alternatively we could replace this line with "FROM $ID" # TODO: Alternatively we could replace this line with "FROM $ID"
# where $ID is the image's hex id obtained with # where $ID is the image's hex id obtained with

2
tests/docker/dockerfiles/debian-alpha-cross.docker
View File

@ -3,7 +3,7 @@
# #
# This docker target builds on the debian Buster base image. # This docker target builds on the debian Buster base image.
# #
FROM qemu:debian10 FROM qemu/debian10
RUN apt update && \ RUN apt update && \
DEBIAN_FRONTEND=noninteractive eatmydata \ DEBIAN_FRONTEND=noninteractive eatmydata \

2
tests/docker/dockerfiles/debian-amd64-cross.docker
View File

@ -4,7 +4,7 @@
# This docker target is used on non-x86_64 machines which need the # This docker target is used on non-x86_64 machines which need the
# x86_64 cross compilers installed. # x86_64 cross compilers installed.
# #
FROM qemu:debian10 FROM qemu/debian10
MAINTAINER Alex Bennée <alex.bennee@linaro.org> MAINTAINER Alex Bennée <alex.bennee@linaro.org>
# Add the foreign architecture we want and install dependencies # Add the foreign architecture we want and install dependencies

2
tests/docker/dockerfiles/debian-amd64.docker
View File

@ -4,7 +4,7 @@
# This docker target builds on the debian Stretch base image. Further # This docker target builds on the debian Stretch base image. Further
# libraries which are not widely available are installed by hand. # libraries which are not widely available are installed by hand.
# #
FROM qemu:debian10 FROM qemu/debian10
MAINTAINER Philippe Mathieu-Daudé <f4bug@amsat.org> MAINTAINER Philippe Mathieu-Daudé <f4bug@amsat.org>
RUN apt update && \ RUN apt update && \

2
tests/docker/dockerfiles/debian-arm64-cross.docker
View File

@ -3,7 +3,7 @@
# #
# This docker target builds on the debian Buster base image. # This docker target builds on the debian Buster base image.
# #
FROM qemu:debian10 FROM qemu/debian10
# Add the foreign architecture we want and install dependencies # Add the foreign architecture we want and install dependencies
RUN dpkg --add-architecture arm64 RUN dpkg --add-architecture arm64

2
tests/docker/dockerfiles/debian-arm64-test-cross.docker
View File

@ -3,7 +3,7 @@
# #
# This docker target builds on the debian Bullseye base image. # This docker target builds on the debian Bullseye base image.
# #
FROM qemu:debian11 FROM qemu/debian11
# Add the foreign architecture we want and install dependencies # Add the foreign architecture we want and install dependencies
RUN dpkg --add-architecture arm64 RUN dpkg --add-architecture arm64

2
tests/docker/dockerfiles/debian-armel-cross.docker
View File

@ -3,7 +3,7 @@
# #
# This docker target builds on the debian Stretch base image. # This docker target builds on the debian Stretch base image.
# #
FROM qemu:debian10 FROM qemu/debian10
MAINTAINER Philippe Mathieu-Daudé <f4bug@amsat.org> MAINTAINER Philippe Mathieu-Daudé <f4bug@amsat.org>
# Add the foreign architecture we want and install dependencies # Add the foreign architecture we want and install dependencies

2
tests/docker/dockerfiles/debian-armhf-cross.docker
View File

@ -3,7 +3,7 @@
# #
# This docker target builds on the debian Stretch base image. # This docker target builds on the debian Stretch base image.
# #
FROM qemu:debian10 FROM qemu/debian10
# Add the foreign architecture we want and install dependencies # Add the foreign architecture we want and install dependencies
RUN dpkg --add-architecture armhf RUN dpkg --add-architecture armhf

2
tests/docker/dockerfiles/debian-hppa-cross.docker
View File

@ -3,7 +3,7 @@
# #
# This docker target builds on the debian Buster base image. # This docker target builds on the debian Buster base image.
# #
FROM qemu:debian10 FROM qemu/debian10
RUN apt update && \ RUN apt update && \
DEBIAN_FRONTEND=noninteractive eatmydata \ DEBIAN_FRONTEND=noninteractive eatmydata \

2
tests/docker/dockerfiles/debian-m68k-cross.docker
View File

@ -3,7 +3,7 @@
# #
# This docker target builds on the debian Buster base image. # This docker target builds on the debian Buster base image.
# #
FROM qemu:debian10 FROM qemu/debian10
RUN apt update && \ RUN apt update && \
DEBIAN_FRONTEND=noninteractive eatmydata \ DEBIAN_FRONTEND=noninteractive eatmydata \

2
tests/docker/dockerfiles/debian-mips-cross.docker
View File

@ -3,7 +3,7 @@
# #
# This docker target builds on the debian Buster base image. # This docker target builds on the debian Buster base image.
# #
FROM qemu:debian10 FROM qemu/debian10
MAINTAINER Philippe Mathieu-Daudé <f4bug@amsat.org> MAINTAINER Philippe Mathieu-Daudé <f4bug@amsat.org>

2
tests/docker/dockerfiles/debian-mips64-cross.docker
View File

@ -3,7 +3,7 @@
# #
# This docker target builds on the debian Buster base image. # This docker target builds on the debian Buster base image.
# #
FROM qemu:debian10 FROM qemu/debian10
RUN apt update && \ RUN apt update && \
DEBIAN_FRONTEND=noninteractive eatmydata \ DEBIAN_FRONTEND=noninteractive eatmydata \

2
tests/docker/dockerfiles/debian-mips64el-cross.docker
View File

@ -4,7 +4,7 @@
# This docker target builds on the debian Stretch base image. # This docker target builds on the debian Stretch base image.
# #
FROM qemu:debian10 FROM qemu/debian10
MAINTAINER Philippe Mathieu-Daudé <f4bug@amsat.org> MAINTAINER Philippe Mathieu-Daudé <f4bug@amsat.org>

2
tests/docker/dockerfiles/debian-mipsel-cross.docker
View File

@ -3,7 +3,7 @@
# #
# This docker target builds on the debian Stretch base image. # This docker target builds on the debian Stretch base image.
# #
FROM qemu:debian10 FROM qemu/debian10
MAINTAINER Philippe Mathieu-Daudé <f4bug@amsat.org> MAINTAINER Philippe Mathieu-Daudé <f4bug@amsat.org>

2
tests/docker/dockerfiles/debian-powerpc-cross.docker
View File

@ -3,7 +3,7 @@
# #
# This docker target builds on the debian Buster base image. # This docker target builds on the debian Buster base image.
# #
FROM qemu:debian10 FROM qemu/debian10
RUN apt update && \ RUN apt update && \
DEBIAN_FRONTEND=noninteractive eatmydata \ DEBIAN_FRONTEND=noninteractive eatmydata \

2
tests/docker/dockerfiles/debian-ppc64-cross.docker
View File

@ -2,7 +2,7 @@
# Docker ppc64 cross-compiler target # Docker ppc64 cross-compiler target
# #
# This docker target builds on the debian Buster base image. # This docker target builds on the debian Buster base image.
FROM qemu:debian10 FROM qemu/debian10
RUN apt update && \ RUN apt update && \
DEBIAN_FRONTEND=noninteractive eatmydata \ DEBIAN_FRONTEND=noninteractive eatmydata \

2
tests/docker/dockerfiles/debian-ppc64el-cross.docker
View File

@ -3,7 +3,7 @@
# #
# This docker target builds on the debian Stretch base image. # This docker target builds on the debian Stretch base image.
# #
FROM qemu:debian10 FROM qemu/debian10
# Add the foreign architecture we want and install dependencies # Add the foreign architecture we want and install dependencies
RUN dpkg --add-architecture ppc64el && \ RUN dpkg --add-architecture ppc64el && \

2
tests/docker/dockerfiles/debian-riscv64-cross.docker
View File

@ -3,7 +3,7 @@
# #
# This docker target builds on the debian Buster base image. # This docker target builds on the debian Buster base image.
# #
FROM qemu:debian10 FROM qemu/debian10
RUN apt update && \ RUN apt update && \
DEBIAN_FRONTEND=noninteractive eatmydata \ DEBIAN_FRONTEND=noninteractive eatmydata \

2
tests/docker/dockerfiles/debian-s390x-cross.docker
View File

@ -3,7 +3,7 @@
# #
# This docker target builds on the debian Stretch base image. # This docker target builds on the debian Stretch base image.
# #
FROM qemu:debian10 FROM qemu/debian10
# Add the s390x architecture # Add the s390x architecture
RUN dpkg --add-architecture s390x RUN dpkg --add-architecture s390x

2
tests/docker/dockerfiles/debian-sh4-cross.docker
View File

@ -3,7 +3,7 @@
# #
# This docker target builds on the debian Buster base image. # This docker target builds on the debian Buster base image.
# #
FROM qemu:debian10 FROM qemu/debian10
RUN apt update && \ RUN apt update && \
DEBIAN_FRONTEND=noninteractive eatmydata \ DEBIAN_FRONTEND=noninteractive eatmydata \

2
tests/docker/dockerfiles/debian-sparc64-cross.docker
View File

@ -3,7 +3,7 @@
# #
# This docker target builds on the debian Buster base image. # This docker target builds on the debian Buster base image.
# #
FROM qemu:debian10 FROM qemu/debian10
RUN apt update && \ RUN apt update && \
DEBIAN_FRONTEND=noninteractive eatmydata \ DEBIAN_FRONTEND=noninteractive eatmydata \

2
tests/docker/dockerfiles/debian-tricore-cross.docker
View File

@ -7,7 +7,7 @@
# #
# SPDX-License-Identifier: GPL-2.0-or-later # SPDX-License-Identifier: GPL-2.0-or-later
# #
FROM qemu:debian9 FROM qemu/debian9
MAINTAINER Philippe Mathieu-Daudé <f4bug@amsat.org> MAINTAINER Philippe Mathieu-Daudé <f4bug@amsat.org>

2
tests/docker/dockerfiles/debian-win32-cross.docker
View File

@ -3,7 +3,7 @@
# #
# This docker target builds on the debian Stretch MXE base image. # This docker target builds on the debian Stretch MXE base image.
# #
FROM qemu:debian9-mxe FROM qemu/debian9-mxe
MAINTAINER Philippe Mathieu-Daudé <f4bug@amsat.org> MAINTAINER Philippe Mathieu-Daudé <f4bug@amsat.org>

2
tests/docker/dockerfiles/debian-win64-cross.docker
View File

@ -3,7 +3,7 @@
# #
# This docker target builds on the debian Stretch MXE base image. # This docker target builds on the debian Stretch MXE base image.
# #
FROM qemu:debian9-mxe FROM qemu/debian9-mxe
MAINTAINER Philippe Mathieu-Daudé <f4bug@amsat.org> MAINTAINER Philippe Mathieu-Daudé <f4bug@amsat.org>

2
tests/docker/dockerfiles/debian9-mxe.docker
View File

@ -3,7 +3,7 @@
# #
# This docker target builds on the debian Stretch base image. # This docker target builds on the debian Stretch base image.
# #
FROM qemu:debian9 FROM qemu/debian9
MAINTAINER Philippe Mathieu-Daudé <f4bug@amsat.org> MAINTAINER Philippe Mathieu-Daudé <f4bug@amsat.org>

4
tests/tcg/Makefile.qemu
View File

@ -47,7 +47,7 @@ ifneq ($(DOCKER_IMAGE),)
DOCKER_COMPILE_CMD="$(DOCKER_SCRIPT) cc \ DOCKER_COMPILE_CMD="$(DOCKER_SCRIPT) cc \
--cc $(DOCKER_CROSS_CC_GUEST) \ --cc $(DOCKER_CROSS_CC_GUEST) \
-i qemu:$(DOCKER_IMAGE) \ -i qemu/$(DOCKER_IMAGE) \
-s $(SRC_PATH) -- " -s $(SRC_PATH) -- "
.PHONY: docker-build-guest-tests .PHONY: docker-build-guest-tests
@ -57,7 +57,7 @@ docker-build-guest-tests: docker-image-$(DOCKER_IMAGE)
$(MAKE) -f $(TCG_MAKE) TARGET="$(TARGET)" CC=$(DOCKER_COMPILE_CMD) \ $(MAKE) -f $(TCG_MAKE) TARGET="$(TARGET)" CC=$(DOCKER_COMPILE_CMD) \
SRC_PATH="$(SRC_PATH)" BUILD_STATIC=y \ SRC_PATH="$(SRC_PATH)" BUILD_STATIC=y \
EXTRA_CFLAGS="$(CROSS_CC_GUEST_CFLAGS)"), \ EXTRA_CFLAGS="$(CROSS_CC_GUEST_CFLAGS)"), \
"BUILD","$(TARGET) guest-tests with docker qemu:$(DOCKER_IMAGE)") "BUILD","$(TARGET) guest-tests with docker qemu/$(DOCKER_IMAGE)")
GUEST_BUILD=docker-build-guest-tests GUEST_BUILD=docker-build-guest-tests