From patchwork Fri Jun 26 18:13:52 2020 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: 191913 Delivered-To: patch@linaro.org Received: by 2002:a54:3249:0:0:0:0:0 with SMTP id g9csp656844ecs; Fri, 26 Jun 2020 11:32:41 -0700 (PDT) X-Google-Smtp-Source: ABdhPJx0xZ/F5AtK6rObLJA5K2WQeZ2qo06TZ5xqA/YwPK4gcaQF3r5OhKNhstL4f+y1ldCbrCr4 X-Received: by 2002:a25:b992:: with SMTP id r18mr6892035ybg.283.1593196361734; Fri, 26 Jun 2020 11:32:41 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1593196361; cv=none; d=google.com; s=arc-20160816; b=cKWLeNDAfXBEdYhuxs+ZAKaNTaw9+HWpawqhWa0FANyUpw+VyPTLgkE4ePhO6bgzRy JXaBmn2NIZOZtyTrvqHPtRqaaENWWG1baHrniFzTgivieiGzbS0D3ijfSSzeS0nq8gjW u6FWWqe925HcZuY8nvWjq3CnGzVklpoHvyUAwCEWW2CfqQl7VQVwbqXEEQn9DrZQieOE sscz3L9PlhQwJo/xAN04KXlow0WQ93GJ/b4W/vWUQstBESZilxBSfIZVsMkjhodOsjsf FjYQatw44AKZKUGMH1t5uhk9umxYcZtVVZvIncKKrPa3yWRr8PDOl/nnIhOg3Fx8pE5p zpug== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=GGghav/BtSCa7AI7P4AufN/sAMwmqjG67Lv4jNv44bc=; b=ZfkWUhRfqXdIOz4SrEyy5Vt9LN7zTqEmx7EXeiWmU+6wCrZWcaMHgnfYPqhJJ/ri3e /8ssv4Jwx+hULr4W1Uyvtdd3UzB/4ljX0hk+YIEIGZxUk8ePoymfVnqE/OhOXDP7DAdb qER+G+wAe6U8X1ae1rZL5OS/XMfwI3nNXMlz7vnjJFFnt+EgL6f8GAjWzbvDsLfxPWRU S/0HQuV7m+ABsh3P5B4XXiLECapJvck0TxsUZA8zrZWuSJZwjQQmzxRP9+uBCEMN8s0d 2KJX2qmVtlHNwqVDe7rvgQlWgtiFjrypXm8DwdiIpf6DtJZuKsb1wUitEPfAnSXv8Ltw 3xAg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=BySoWsPu; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id 132si25557506yba.45.2020.06.26.11.32.41 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 26 Jun 2020 11:32:41 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=BySoWsPu; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 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]:51430 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jot9V-0001yM-5O for patch@linaro.org; Fri, 26 Jun 2020 14:32:41 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58448) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jot0K-00042j-Lh for qemu-devel@nongnu.org; Fri, 26 Jun 2020 14:23:12 -0400 Received: from mail-wr1-x442.google.com ([2a00:1450:4864:20::442]:39580) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jot0I-0005B9-T2 for qemu-devel@nongnu.org; Fri, 26 Jun 2020 14:23:12 -0400 Received: by mail-wr1-x442.google.com with SMTP id q5so10367650wru.6 for ; Fri, 26 Jun 2020 11:23:10 -0700 (PDT) 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=GGghav/BtSCa7AI7P4AufN/sAMwmqjG67Lv4jNv44bc=; b=BySoWsPujD97s8bXQMy3JWQVW+XKHDZuN+0NPrP+f/yP8CRUBPelNVpQKgJ51T2M5v BINpS1aKzArbf2u8RI0U8IvhINBuL83ORgBtZKVqjZ311B6/iZOlb+8r/lswGZNru4pK RnnamZZyO5pltCzJ8Hel6XilFdIEgqjvQ3qzJbMfmiJTw2rVy2AcVP5Cux0R1Wb3px/S zCVDbWRQAfGQUn0D6EYRAB3LbKLwVI0nuYY10twdav7rWu2qSzo70XAKFS6+HGAe15Us wIPdRjYQ7cr8zfrBbV/rm1gCHvkUTEZdsazefPFtFn9SvcVZJMyo6Ag0qDuiq11bz3nP GgEg== 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=GGghav/BtSCa7AI7P4AufN/sAMwmqjG67Lv4jNv44bc=; b=sGpMNKRMmE0lQxSb6ivGAmpigHx61Y/rK+EHX9aW2c+UQ73euHudjaCa4W+KiXr3+s 103uIEzuxBfem0Y1BIpZqDh6AVHoVd6XInXKeEUtBaOi8PsGGSnv4mDQLTw/Qlh+CwNW feFVM289dfDfVLyfnlQQAXjat6DHvvMODD7kGqwQZy7QJbdkI70k2gBGaf9UqNKUkaL7 H79G7czbK73JnF0Kmj0fDKknsPlAMLM00qnPBKKn45t+xiKVI0JZ8ym0wh6A5vanQeO7 QnExtkOZUnsi6Yj7scHNuxZpIHZ25xQJJxx8tRPfX6X6DCqcuvufywQ7DP3L2/a+Bxo0 hAyQ== X-Gm-Message-State: AOAM532pKCv3QY/phWqq3/UqeXPoAjeSSccIiQziTBxkOOP7qB72QrZ6 npLwjQDENhC6PhrGObcUM9WpCA== X-Received: by 2002:adf:e908:: with SMTP id f8mr4956493wrm.3.1593195789624; Fri, 26 Jun 2020 11:23:09 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id a81sm18496986wmf.30.2020.06.26.11.22.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 26 Jun 2020 11:23:05 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 2ED451FFAC; Fri, 26 Jun 2020 19:14:03 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v3 25/30] tests/docker: add a linux-user testing focused image Date: Fri, 26 Jun 2020 19:13:52 +0100 Message-Id: <20200626181357.26211-26-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200626181357.26211-1-alex.bennee@linaro.org> References: <20200626181357.26211-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::442; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x442.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=_AUTOLEARN X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: fam@euphon.net, berrange@redhat.com, =?utf-8?q?Alex_Benn=C3=A9e?= , richard.henderson@linaro.org, f4bug@amsat.org, =?utf-8?q?Philippe_Mat?= =?utf-8?q?hieu-Daud=C3=A9?= , cota@braap.org, aurelien@aurel32.net Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" We happily use all the cross images for both cross-building QEMU as well as building the linux-user tests. However calling docker from within docker seems not to work. As we can build in Debian anyway why not include an image that has all the compilers available for non-docker invocation. Signed-off-by: Alex Bennée --- .gitlab-ci.d/containers.yml | 7 +++ tests/docker/Makefile.include | 1 + .../dockerfiles/debian-all-test-cross.docker | 53 +++++++++++++++++++ 3 files changed, 61 insertions(+) create mode 100644 tests/docker/dockerfiles/debian-all-test-cross.docker -- 2.20.1 Reviewed-by: Philippe Mathieu-Daudé diff --git a/.gitlab-ci.d/containers.yml b/.gitlab-ci.d/containers.yml index ba9c24e98f1..20b2fb1de5d 100644 --- a/.gitlab-ci.d/containers.yml +++ b/.gitlab-ci.d/containers.yml @@ -66,6 +66,13 @@ amd64-debian-cross-container: variables: NAME: debian-amd64-cross +amd64-debian-user-cross-container: + <<: *container_job_definition + stage: containers-layer2 + needs: ['amd64-debian10-container'] + variables: + NAME: debian-all-test-cross + amd64-debian-container: <<: *container_job_definition stage: containers-layer2 diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include index 8139e8467d4..079ceb6ff33 100644 --- a/tests/docker/Makefile.include +++ b/tests/docker/Makefile.include @@ -133,6 +133,7 @@ docker-image-travis: NOUSER=1 # Specialist build images, sometimes very limited tools docker-image-debian-tricore-cross: docker-image-debian9 +docker-image-debian-all-test-cross: docker-image-debian10 docker-image-debian-arm64-test-cross: docker-image-debian11 # These images may be good enough for building tests but not for test builds diff --git a/tests/docker/dockerfiles/debian-all-test-cross.docker b/tests/docker/dockerfiles/debian-all-test-cross.docker new file mode 100644 index 00000000000..dedcea58b46 --- /dev/null +++ b/tests/docker/dockerfiles/debian-all-test-cross.docker @@ -0,0 +1,53 @@ +# +# Docker all cross-compiler target (tests only) +# +# While the normal cross builds take care to setup proper multiarch +# build environments which can cross build QEMU this just installs the +# basic compilers for as many targets as possible. We shall use this +# to build and run linux-user tests on GitLab +# +FROM qemu/debian10 + +# What we need to build QEMU itself +RUN apt update && \ + DEBIAN_FRONTEND=noninteractive eatmydata \ + apt build-dep -yy qemu + +# Add the foreign architecture we want and install dependencies +RUN DEBIAN_FRONTEND=noninteractive eatmydata \ + apt install -y --no-install-recommends \ + gcc-aarch64-linux-gnu \ + libc6-dev-arm64-cross \ + gcc-alpha-linux-gnu \ + libc6.1-dev-alpha-cross \ + gcc-arm-linux-gnueabihf \ + libc6-dev-armhf-cross \ + gcc-hppa-linux-gnu \ + libc6-dev-hppa-cross \ + gcc-m68k-linux-gnu \ + libc6-dev-m68k-cross \ + gcc-mips-linux-gnu \ + libc6-dev-mips-cross \ + gcc-mips64-linux-gnuabi64 \ + libc6-dev-mips64-cross \ + gcc-mips64el-linux-gnuabi64 \ + libc6-dev-mips64el-cross \ + gcc-mipsel-linux-gnu \ + libc6-dev-mipsel-cross \ + gcc-powerpc-linux-gnu \ + libc6-dev-powerpc-cross \ + gcc-powerpc64-linux-gnu \ + libc6-dev-ppc64-cross \ + gcc-powerpc64le-linux-gnu \ + libc6-dev-ppc64el-cross \ + gcc-riscv64-linux-gnu \ + libc6-dev-riscv64-cross \ + gcc-s390x-linux-gnu \ + libc6-dev-s390x-cross \ + gcc-sh4-linux-gnu \ + libc6-dev-sh4-cross \ + gcc-sparc64-linux-gnu \ + libc6-dev-sparc64-cross + +ENV QEMU_CONFIGURE_OPTS --disable-system --disable-docs --disable-tools +ENV DEF_TARGET_LIST aarch64-linux-user,alpha-linux-user,arm-linux-user,hppa-linux-user,i386-linux-user,m68k-linux-user,mips-linux-user,mips64-linux-user,mips64el-linux-user,mipsel-linux-user,ppc-linux-user,ppc64-linux-user,ppc64le-linux-user,riscv64-linux-user,s390x-linux-user,sh4-linux-user,sparc64-linux-user