From patchwork Tue Feb 14 10:07:31 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 93943 Delivered-To: patch@linaro.org Received: by 10.140.20.99 with SMTP id 90csp1487704qgi; Tue, 14 Feb 2017 02:09:58 -0800 (PST) X-Received: by 10.200.39.130 with SMTP id w2mr25295192qtw.280.1487066998706; Tue, 14 Feb 2017 02:09:58 -0800 (PST) Return-Path: Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id d24si62917qtd.14.2017.02.14.02.09.58 for (version=TLS1 cipher=AES128-SHA bits=128/128); Tue, 14 Feb 2017 02:09:58 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom=qemu-devel-bounces+patch=linaro.org@nongnu.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:33623 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cda3X-0007Aj-IA for patch@linaro.org; Tue, 14 Feb 2017 05:09:55 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:55726) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cda12-00063x-Uc for qemu-devel@nongnu.org; Tue, 14 Feb 2017 05:07:26 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cda0y-0008Lz-TJ for qemu-devel@nongnu.org; Tue, 14 Feb 2017 05:07:20 -0500 Received: from mail-wr0-x22d.google.com ([2a00:1450:400c:c0c::22d]:36671) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1cda0y-0008LV-Js for qemu-devel@nongnu.org; Tue, 14 Feb 2017 05:07:16 -0500 Received: by mail-wr0-x22d.google.com with SMTP id k90so165993890wrc.3 for ; Tue, 14 Feb 2017 02:07:16 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=a2kJ79WiQE6PVes0FpLaFH6ISUueudE0M5zaPutZal8=; b=ciNJfnxiKaY6sR0u63CeEVrmfbbwMXlubK+Q4XOInKbHADa2slaiTC+XRwZL9HtSPm KrO7CBjz80QvNWOTK5Dqf1coogDEitOOQ8EUrtsnutSoVOHImcPDxD2vb1psmAxVp9UD xAHt38ClXlD7KSse4W/Xd3qOzA8y6d7kuB2Nw= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=a2kJ79WiQE6PVes0FpLaFH6ISUueudE0M5zaPutZal8=; b=tkyQYfvUlr0wfRHcLhqLcgbtBEgQCOPpynkGXaZKR1NNCwnp1ckyJLYXfzEaJxPblW tXG05FV3KjZp26Z4RjqZtCkzBuTzI+9+DM30e/4sMm7F2iODuhPNiKt7qlkSryJOznPp W1DnpJLdKu5ixAfDX+1fA5TRP6vxk2LqclARz/NxBAXPswfHAVNIxeelGqXKB+9yeIhb FtYyqciGJz56a8CgDA8GJ22CZyrajS7lhpmbqXNc+ujta1QGWT4ki5n8K6uDIVhxS2bF KnpodHqXhz7HbnnbSlIyCili5AjeblBc2Y9XODm1IEnYp36RkbzFWmgrTbPshbCrp23i cCtw== X-Gm-Message-State: AMke39ml9CH3hUarM7hEIDkIememnF9arK58yoSAb6Hi31ufyTCkKC1zWJkfL5E6hVfHjKCa X-Received: by 10.223.161.158 with SMTP id u30mr22812269wru.152.1487066835498; Tue, 14 Feb 2017 02:07:15 -0800 (PST) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id 48sm87582wrt.54.2017.02.14.02.07.13 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 14 Feb 2017 02:07:13 -0800 (PST) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id C53693E097D; Tue, 14 Feb 2017 10:07:33 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: famz@redhat.com Date: Tue, 14 Feb 2017 10:07:31 +0000 Message-Id: <20170214100733.22280-2-alex.bennee@linaro.org> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170214100733.22280-1-alex.bennee@linaro.org> References: <20170214100733.22280-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2a00:1450:400c:c0c::22d Subject: [Qemu-devel] [PATCH v3 1/3] tests/docker: add basic user mapping support X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?utf-8?q?Alex_Benn=C3=A9e?= , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Currently all docker builds are done by exporting a tarball to the docker container and running the build as the containers root user. Other use cases are possible however and it is possible to map a part of users file-system to the container. This is useful for example for doing cross-builds of arbitrary source trees. For this to work smoothly the container needs to have a user created that maps cleanly to the host system. This adds a -u option to the docker script so that: DEB_ARCH=armhf DEB_TYPE=stable ./tests/docker/docker.py build \ -u --include-executable=arm-linux-user/qemu-arm \ debian:armhf ./tests/docker/dockerfiles/debian-bootstrap.docker Will build a container that can then be run like: docker run --rm -it -v /home/alex/lsrc/qemu/risu.git/:/src \ --user=alex:alex -w /src/ debian:armhf \ sh -c "make clean && ./configure -s && make" Alternatively specifying USER will add the appropriate stanza when building via the Makefile: make docker-image-debian-armhf-cross USER=1 Signed-off-by: Alex Bennée Reviewed-by: Fam Zheng --- v2 - write the useradd directly - change long option to --add-current-user v3 - images -> image's - add r-b - add USER to Makefile --- tests/docker/Makefile.include | 2 ++ tests/docker/docker.py | 15 +++++++++++++-- 2 files changed, 15 insertions(+), 2 deletions(-) -- 2.11.0 diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include index 3f15d5aea8..8db55e43aa 100644 --- a/tests/docker/Makefile.include +++ b/tests/docker/Makefile.include @@ -50,6 +50,7 @@ docker-image-%: $(DOCKER_FILES_DIR)/%.docker $(call quiet-command,\ $(SRC_PATH)/tests/docker/docker.py build qemu:$* $< \ $(if $V,,--quiet) $(if $(NOCACHE),--no-cache) \ + $(if $(USER),--add-current-user,) \ $(if $(EXECUTABLE),--include-executable=$(EXECUTABLE)),\ "BUILD","$*") @@ -99,6 +100,7 @@ docker: @echo ' (default is 1)' @echo ' DEBUG=1 Stop and drop to shell in the created container' @echo ' before running the command.' + @echo ' USER=1 Add current user to docker image.' @echo ' NOCACHE=1 Ignore cache when build images.' @echo ' EXECUTABLE= Include executable in image.' diff --git a/tests/docker/docker.py b/tests/docker/docker.py index 37d83199e7..3e6e7c6460 100755 --- a/tests/docker/docker.py +++ b/tests/docker/docker.py @@ -25,6 +25,7 @@ import signal from tarfile import TarFile, TarInfo from StringIO import StringIO from shutil import copy, rmtree +from pwd import getpwuid DEVNULL = open(os.devnull, 'wb') @@ -149,13 +150,20 @@ class Docker(object): labels = json.loads(resp)[0]["Config"].get("Labels", {}) return labels.get("com.qemu.dockerfile-checksum", "") - def build_image(self, tag, docker_dir, dockerfile, quiet=True, argv=None): + def build_image(self, tag, docker_dir, dockerfile, + quiet=True, user=False, argv=None): if argv == None: argv = [] tmp_df = tempfile.NamedTemporaryFile(dir=docker_dir, suffix=".docker") tmp_df.write(dockerfile) + if user: + uid = os.getuid() + uname = getpwuid(uid).pw_name + tmp_df.write("\n") + tmp_df.write("RUN useradd -u %d -U %s" % (uid, uname)) + tmp_df.write("\n") tmp_df.write("LABEL com.qemu.dockerfile-checksum=%s" % _text_checksum(dockerfile)) @@ -225,6 +233,9 @@ class BuildCommand(SubCommand): help="""Specify a binary that will be copied to the container together with all its dependent libraries""") + parser.add_argument("--add-current-user", "-u", dest="user", + action="store_true", + help="Add the current user to image's passwd") parser.add_argument("tag", help="Image Tag") parser.add_argument("dockerfile", @@ -261,7 +272,7 @@ class BuildCommand(SubCommand): docker_dir) dkr.build_image(tag, docker_dir, dockerfile, - quiet=args.quiet, argv=argv) + quiet=args.quiet, user=args.user, argv=argv) rmtree(docker_dir) From patchwork Tue Feb 14 10:07:32 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 93944 Delivered-To: patch@linaro.org Received: by 10.140.20.99 with SMTP id 90csp1488633qgi; Tue, 14 Feb 2017 02:12:49 -0800 (PST) X-Received: by 10.200.42.66 with SMTP id l2mr25816292qtl.33.1487067169213; Tue, 14 Feb 2017 02:12:49 -0800 (PST) Return-Path: Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id r3si63782qkb.46.2017.02.14.02.12.48 for (version=TLS1 cipher=AES128-SHA bits=128/128); Tue, 14 Feb 2017 02:12:49 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom=qemu-devel-bounces+patch=linaro.org@nongnu.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:33647 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cda6I-0001X0-QN for patch@linaro.org; Tue, 14 Feb 2017 05:12:46 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:55727) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cda12-00063y-Uf for qemu-devel@nongnu.org; Tue, 14 Feb 2017 05:07:22 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cda10-0008N2-Qo for qemu-devel@nongnu.org; Tue, 14 Feb 2017 05:07:20 -0500 Received: from mail-wr0-x232.google.com ([2a00:1450:400c:c0c::232]:34954) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1cda10-0008Ma-KC for qemu-devel@nongnu.org; Tue, 14 Feb 2017 05:07:18 -0500 Received: by mail-wr0-x232.google.com with SMTP id c4so8432631wrd.2 for ; Tue, 14 Feb 2017 02:07:18 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=pLzb3G5b6qPqu3N8HmJOX8e9Ey5OWfcDJozblCnuXeg=; b=bd5aP8gnXN7lgxWG5w1ul0wwnyjl7YnTtdLOqCi1/1BF0B9w70/+lGrxVWxb9vJBGZ bDnXM3DxySVkLW0ONKZPM4ayoNqZCVMjpcO38b+reSIWB3VDCLcRMrddRIvjAlLlRD7H dvsoGsVokgYfDw+S1qGEV+NkajNANy0VDKMvc= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=pLzb3G5b6qPqu3N8HmJOX8e9Ey5OWfcDJozblCnuXeg=; b=kbcI8IpJGmKIKapcqs/k1SNQcFaZFd4ZtqFDJb3V6JF/s14dJGUfFKRNmmeeMDiPb5 vG2sSh2mDwOtJawSYuVcxrTxbkYCNc6U/Y/z3iXW65ZxSUzkWOzG7uWOY6cqSKC/L0ff 8DOcrPsh1aVc50+Vhme5uOOdFzQh0kNeipSLEXBzXm9FxgdMtzLn9hIMW1Nx3xoAESbU hrvdshALnaKScw/9EdA+gMrsm6TxxlL5EIq9tH7reNcdm3ZS8aufjfyq85C0P+TMG/DN Q26iL/TAXi3Umc1dHEiDvyQ5qLWyt27Rkt2tdxeixq2SptrlB7Vr3tQrnSwqBrqexqcW fLSA== X-Gm-Message-State: AMke39mWgKsUHlHu3bWUCa+vk9vBrcXRHU6hmaNjfJlOlaLJEhKLytk6rIyWYS3jNT7rx95l X-Received: by 10.223.133.164 with SMTP id 33mr24557014wrt.39.1487066837553; Tue, 14 Feb 2017 02:07:17 -0800 (PST) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id m80sm569376wmi.34.2017.02.14.02.07.13 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 14 Feb 2017 02:07:15 -0800 (PST) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id D8FD53E0A8C; Tue, 14 Feb 2017 10:07:33 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: famz@redhat.com Date: Tue, 14 Feb 2017 10:07:32 +0000 Message-Id: <20170214100733.22280-3-alex.bennee@linaro.org> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170214100733.22280-1-alex.bennee@linaro.org> References: <20170214100733.22280-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2a00:1450:400c:c0c::232 Subject: [Qemu-devel] [PATCH v3 2/3] new: debian docker targets for cross-compiling X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?utf-8?q?Alex_Benn=C3=A9e?= , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" This provides a basic Debian install with access to the emdebian cross compilers. The debian-armhf-cross and debian-arm64-cross targets build on the basic Debian image to allow cross compiling to those targets. To build against the cross compiler a cross-compile prefix needs to be set in the configure options, for example: make docker-test-build@debian-arm64-cross \ EXTRA_CONFIGURE_OPTS="--cross-prefix=aarch64-linux-gnu-" \ TARGET_LIST="aarch64-softmmu,aarch64-linux-user" Signed-off-by: Alex Bennée --- v2 - add clang (keep shippable happy) - rm adduser code (done direct now) - add aptitude (useful for debugging package clashes) v3 - split into debian, debian-armhf-cross and debian-aarch64-cross --- tests/docker/Makefile.include | 4 ++++ tests/docker/dockerfiles/debian-arm64-cross.docker | 12 +++++++++++ tests/docker/dockerfiles/debian-armhf-cross.docker | 12 +++++++++++ tests/docker/dockerfiles/debian.docker | 25 ++++++++++++++++++++++ 4 files changed, 53 insertions(+) create mode 100644 tests/docker/dockerfiles/debian-arm64-cross.docker create mode 100644 tests/docker/dockerfiles/debian-armhf-cross.docker create mode 100644 tests/docker/dockerfiles/debian.docker -- 2.11.0 diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include index 8db55e43aa..dbd12d9042 100644 --- a/tests/docker/Makefile.include +++ b/tests/docker/Makefile.include @@ -54,6 +54,10 @@ docker-image-%: $(DOCKER_FILES_DIR)/%.docker $(if $(EXECUTABLE),--include-executable=$(EXECUTABLE)),\ "BUILD","$*") +# Enforce dependancies for composite images +docker-image-debian-armhf-cross: docker-image-debian +docker-image-debian-arm64-cross: docker-image-debian + # Expand all the pre-requistes for each docker image and test combination $(foreach i,$(DOCKER_IMAGES), \ $(foreach t,$(DOCKER_TESTS) $(DOCKER_TOOLS), \ diff --git a/tests/docker/dockerfiles/debian-arm64-cross.docker b/tests/docker/dockerfiles/debian-arm64-cross.docker new file mode 100644 index 0000000000..04212629f7 --- /dev/null +++ b/tests/docker/dockerfiles/debian-arm64-cross.docker @@ -0,0 +1,12 @@ +# +# Docker arm64 cross-compiler target +# +# This docker target builds on the base debian image. +# +FROM qemu:debian + +# Add the foreign architecture we want and install dependacies +RUN dpkg --add-architecture arm64 +RUN apt update +RUN apt install -yy crossbuild-essential-arm64 +RUN apt-get build-dep -yy -a arm64 qemu diff --git a/tests/docker/dockerfiles/debian-armhf-cross.docker b/tests/docker/dockerfiles/debian-armhf-cross.docker new file mode 100644 index 0000000000..1377641e3e --- /dev/null +++ b/tests/docker/dockerfiles/debian-armhf-cross.docker @@ -0,0 +1,12 @@ +# +# Docker armhf cross-compiler target +# +# This docker target builds on the base debian image. +# +FROM qemu:debian + +# Add the foreign architecture we want and install dependacies +RUN dpkg --add-architecture armhf +RUN apt update +RUN apt install -yy crossbuild-essential-armhf +RUN apt-get build-dep -yy -a armhf qemu diff --git a/tests/docker/dockerfiles/debian.docker b/tests/docker/dockerfiles/debian.docker new file mode 100644 index 0000000000..52bd79938e --- /dev/null +++ b/tests/docker/dockerfiles/debian.docker @@ -0,0 +1,25 @@ +# +# Docker multiarch cross-compiler target +# +# This docker target is builds on Debian and Emdebian's 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:stable-slim + +# Setup some basic tools we need +RUN apt update +RUN apt install -yy curl aptitude + +# Setup Emdebian +RUN echo "deb http://emdebian.org/tools/debian/ jessie main" >> /etc/apt/sources.list +RUN curl http://emdebian.org/tools/debian/emdebian-toolchain-archive.key | apt-key add - + +# 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 +RUN apt install -yy build-essential clang From patchwork Tue Feb 14 10:07:33 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 93941 Delivered-To: patch@linaro.org Received: by 10.140.20.99 with SMTP id 90csp1487652qgi; Tue, 14 Feb 2017 02:09:49 -0800 (PST) X-Received: by 10.200.56.76 with SMTP id r12mr25133850qtb.2.1487066989151; Tue, 14 Feb 2017 02:09:49 -0800 (PST) Return-Path: Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id g48si43412qtc.233.2017.02.14.02.09.48 for (version=TLS1 cipher=AES128-SHA bits=128/128); Tue, 14 Feb 2017 02:09:49 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom=qemu-devel-bounces+patch=linaro.org@nongnu.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:33621 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cda3N-00072V-UV for patch@linaro.org; Tue, 14 Feb 2017 05:09:46 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:55724) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cda12-00063w-Tp for qemu-devel@nongnu.org; Tue, 14 Feb 2017 05:07:22 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cda0z-0008MP-Qr for qemu-devel@nongnu.org; Tue, 14 Feb 2017 05:07:20 -0500 Received: from mail-wr0-x236.google.com ([2a00:1450:400c:c0c::236]:33725) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1cda0z-0008M4-Kr for qemu-devel@nongnu.org; Tue, 14 Feb 2017 05:07:17 -0500 Received: by mail-wr0-x236.google.com with SMTP id i10so166529240wrb.0 for ; Tue, 14 Feb 2017 02:07:17 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=hJtrtuRwrW7nhh0xNplZHcj/pQyPmjFffX3kpi8ZpG8=; b=BO2Qonnk+S0oyLjrEYfBdhCvmq55TvrGaWSTVkY35guN7QQNXfG5YECRiKE2nU5zcf 4RV6SWj36PLP8GbSc4XJFLU1o+jFfn3/eQ54h52Z7Fu0HSzbkc6PkEIp94r9LLzWVWpv EHiVsh/nQrnbjv973jFWFzzX8HhCKAySYR8sA= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=hJtrtuRwrW7nhh0xNplZHcj/pQyPmjFffX3kpi8ZpG8=; b=ke21iVdnfkQEAVCZ45GiDerkUqA65GLkypoJqnCLz9kKqAgrlYEPWL5I018SnPf8Kq xQAwPKPz/EbyD2HrxhlAn/1Y40AvCXje2sF24iAChsTESsmkA7YQhviS0UUwZ9kvQ+7Q uF+sK2KzcPxCGFgK/xpCt51leJ5UNjHpOMCUWRpx89LKCgK9jJhd3AzfiHO95gDtPDHP TBiYPnfRWfIAoxrrmKAWF4HiCdmMu77wUuJdp5gideAGlvLpNikNxoCTuJDgCB+N8bkv 35lI/tPMvbwApXNLXf/K1K98Via8qiOjuPEelS3pViOhBQoOkLnWDii7EQvnEjHj6BuA pnjg== X-Gm-Message-State: AMke39khkq23oF8WstxMeRJPiXKMBSQ6VZ31OThxJl+f9CEfhZUjYrQwNj9jNy0Fr+LDhrZp X-Received: by 10.223.139.220 with SMTP id w28mr24528616wra.172.1487066836602; Tue, 14 Feb 2017 02:07:16 -0800 (PST) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id t30sm86605wra.52.2017.02.14.02.07.13 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 14 Feb 2017 02:07:15 -0800 (PST) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id EAAC23E0A9A; Tue, 14 Feb 2017 10:07:33 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: famz@redhat.com Date: Tue, 14 Feb 2017 10:07:33 +0000 Message-Id: <20170214100733.22280-4-alex.bennee@linaro.org> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170214100733.22280-1-alex.bennee@linaro.org> References: <20170214100733.22280-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2a00:1450:400c:c0c::236 Subject: [Qemu-devel] [PATCH v3 3/3] .shippable.yml: new CI provider X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?utf-8?q?Alex_Benn=C3=A9e?= , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Ostensibly Shippable offers a similar set of services as Travis. However they are focused on Docker container based work-flows so we can use our existing containers to run a few extra builds - in this case a bunch of cross-compiled targets on a Debian multiarch system. Signed-off-by: Alex Bennée --- v3 - reduce matrix to armhf/arm64 which currently work - use the make docker-image-* build stanzas - add TARGET_LIST to each build --- .shippable.yml | 23 +++++++++++++++++++++++ MAINTAINERS | 1 + 2 files changed, 24 insertions(+) create mode 100644 .shippable.yml -- 2.11.0 diff --git a/.shippable.yml b/.shippable.yml new file mode 100644 index 0000000000..e4fa159481 --- /dev/null +++ b/.shippable.yml @@ -0,0 +1,23 @@ +language: c +env: + matrix: + - IMAGE=debian-armhf-cross + CROSS_PREFIX=arm-linux-gnueabihf- + TARGET_LIST=arm-softmmu,arm-linux-user + - IMAGE=debian-arm64-cross + CROSS_PREFIX=aarch64-linux-gnu- + TARGET_LIST=aarch64-softmmu,aarch64-linux-user + - IMAGE=centos6 + TARGET_LIST=i386-softmmu,x86_64-softmmu +build: + pre_ci: + - make docker-image-${IMAGE} + pre_ci_boot: + image_name: qemu + image_tag: ${IMAGE} + pull: false + options: "-e HOME=/root" + ci: + - unset CC + - ./configure --cross-prefix=${CROSS_PREFIX} --target-list=${TARGET_LIST} + - make -j2 diff --git a/MAINTAINERS b/MAINTAINERS index 7afbadaa15..578888d32d 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1805,6 +1805,7 @@ M: Alex Bennée L: qemu-devel@nongnu.org S: Supported F: .travis.yml +F: .shippable.yml Documentation -------------