From patchwork Wed Jun 24 14:04:21 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: 191650 Delivered-To: patch@linaro.org Received: by 2002:a92:1f07:0:0:0:0:0 with SMTP id i7csp623977ile; Wed, 24 Jun 2020 07:05:10 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzneK11QQsEOy4FSw4jSlp9cvgTNHP0zdnTd8nk+Ef8hu1jJgV7MOmtx1wt9VnSKyJq54sx X-Received: by 2002:ac8:6bc8:: with SMTP id b8mr26459348qtt.198.1593007510163; Wed, 24 Jun 2020 07:05:10 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1593007510; cv=none; d=google.com; s=arc-20160816; b=TZh+s3HR7VbDv8QqeKyxuQqK31wUJpA+NWDvo5Z4wiXcUm7qnrKh35mXUsUEnzwkui JxSmN+gs+6By8Su8bOc/fpYmBB6NpNKTr62XI9QDawO/j0BUQzNonEB+/DFRXKoyYGQa 8T6I65eSsn9Cgfy5WlGHLFa1B8R2GzFLzOoNG54jTPZ+Pctsp+64lELMPoTDFHda6g26 e9pzTViKj8Py3pmwU3gBhY6r8c1n/NIFI3UfU7SXR3OPdrdjFaQUzyGJtrLGa/fWhVbZ riUT6TpNzF80eeqEB2C5VLVrFKCl+q7ySmp0Tq+3R70zXC9EoiZBdShUFPLuwnfscnp2 e2WQ== 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:message-id:date:subject:to:from:dkim-signature; bh=xBwYsX4gZ0dAQBwodESlnIFaKnt72aLoTgwWNaqkZCM=; b=Ezas15C/EQxk3StPTwBQCWq4u4/AEHu3FDHpHlxKf7GJ74wKbIyIqSqZ7VM0OJWY/s wX+lCs7lfrG5Zqfci9NyOWM1zW/GzZXQl9zfUByl2iluOpe62x6xlLWk2FHlbaGoFYSD 0yrEwA27dYZl5V2oqwxV2pm5d+r3sCnKCgHgYLg+zlk+huj/TmgL5VlRrprOm5qSqpiQ 6PvbOqA5G2kyGyjZZGRU3sTmUcrbIBeqike1h+CvBGOsda13bxYdaZDNIv7HR5e6B7v2 3lEsLR1BSs1SDVjzyumw3cQuI7XI83RTYwtx1bIGm4eP6EcGAhTo29xCSnLanOdIw2H2 VVcg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=Jy4etx+1; 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 n12si951777qtk.224.2020.06.24.07.05.10 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 24 Jun 2020 07:05:10 -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=Jy4etx+1; 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]:58040 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jo61V-0004m2-Gj for patch@linaro.org; Wed, 24 Jun 2020 10:05:09 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:59014) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jo61E-0004ls-Fl for qemu-devel@nongnu.org; Wed, 24 Jun 2020 10:04:52 -0400 Received: from mail-wm1-x341.google.com ([2a00:1450:4864:20::341]:55380) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jo61C-0003Tu-52 for qemu-devel@nongnu.org; Wed, 24 Jun 2020 10:04:52 -0400 Received: by mail-wm1-x341.google.com with SMTP id g75so2435036wme.5 for ; Wed, 24 Jun 2020 07:04:49 -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:mime-version :content-transfer-encoding; bh=xBwYsX4gZ0dAQBwodESlnIFaKnt72aLoTgwWNaqkZCM=; b=Jy4etx+1VZXao65URNYDi8ukZWGjuw1XoTe/bqOPA++plqNZCLdYGvelK3VABShoL7 a3zzc80bQPvafYoyTXdycwuiT7rexco9DZS53eSLsWF0pf42c37LQ4Mi4sQ+Gwry7JKp p4W0Ii4amf5rz1baY0le4OUR/PD37jA90G2DOsj02VdipVRtMbsijcDM+VDH/88cbV7M 7I/Ydz4gSYlde4dIz6PiGi5PMPCQSjrY+lQN5SMjCJfUvxBvzKjFfScBhD/dbvgfyCwq R/RSocNZ8M1Q1KUkHLXvcNd+bS9yNA1lBzoyo2SnZh39P5ZFhaOobk7MGXU+dEkq9UDy WfkQ== 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:mime-version :content-transfer-encoding; bh=xBwYsX4gZ0dAQBwodESlnIFaKnt72aLoTgwWNaqkZCM=; b=rqab6C9TB5wn2qzkqTNFsC0+J/V5y+HPhWhCRcVqikrVA8fO93YpmcHXyBAEaQFp7E ljMr4kcpFUy86+ThIqM+LJr5C+key3lvnH8SHOtTLV8Pr0VZaGq0hwIq+cLc4e+BUVJ+ Q8174sPNAojld3UrEicvNDeAZKwLRQ1srwstkbkJNAS9tTnKylKIAXsnr5n5d0FOxNDG 22HogmklexFeEHjMCIrZrpsWIOoEyaqq5YmcODais4AAItZwPgLvfQvv4069GIPG1bj8 4EkuNZnWMjek+go3vMXYCXIKXNeDp0deWTcw571AHIRrUh01uCwIbs9k1sBkLeyRSulZ MEhg== X-Gm-Message-State: AOAM533Ppa0XE6nAIYIPq6YvJbj6jHbozTTPQC9UFKbjbk2UeYHaV+h0 aSqCTEQaN1ist/4RiKRvruV7Rg== X-Received: by 2002:a1c:32c4:: with SMTP id y187mr30537329wmy.79.1593007488078; Wed, 24 Jun 2020 07:04:48 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id g144sm8793520wme.2.2020.06.24.07.04.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 24 Jun 2020 07:04:46 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 378B01FF7E; Wed, 24 Jun 2020 15:04:46 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v2 00/25] testing/next (vm, gitlab, docker) Date: Wed, 24 Jun 2020 15:04:21 +0100 Message-Id: <20200624140446.15380-1-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::341; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x341.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, URIBL_BLOCKED=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, cota@braap.org, aurelien@aurel32.net Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Hi, This is the current state of my testing/next queue. The main changes from the last post: https://patchew.org/QEMU/20200622143204.12921-1-alex.bennee@linaro.org/ are the inclusion of Danial's excellent work to generate containers which are stored in the gitlab registry and used as a basis for the builds in gitlab (saving the manual apt/yum steps we used to do). On top of those changes I've tried to tweak the tooling so a local build can pull cached images from a REGISTRY. So far it doesn't seem to be working although it does attempt to do it. I've included the patches for review and in the hopes someone else can help debug what else we need to do. The following need review: - gitlab: split build-disabled into two phases - gitlab: enable check-tcg for linux-user tests - gitlab: add acceptance testing to system builds - tests/docker: add --registry support to tooling - gitlab: build containers with buildkit and metadata - .gitignore: un-ignore .gitlab-ci.d - tests/docker: change tag naming scheme of our images Alex Bennée (11): tests/vm: switch from optsparse to argparse tests/vm: allow us to take advantage of MTTCG tests/docker: check for an parameters not empty string tests/docker: change tag naming scheme of our images .gitignore: un-ignore .gitlab-ci.d gitlab: build containers with buildkit and metadata tests/docker: add --registry support to tooling gitlab: add acceptance testing to system builds gitlab: enable check-tcg for linux-user tests gitlab: add avocado asset caching gitlab: split build-disabled into two phases Daniel P. Berrangé (3): gitlab: introduce explicit "container" and "build" stages gitlab: build all container images during CI gitlab: convert jobs to use custom built containers David Edmondson (1): crypto/linux_keyring: fix 'secret_keyring' configure test Philippe Mathieu-Daudé (1): iotests: Fix 051 output after qdev_init_nofail() removal Robert Foley (9): tests/vm: pass args through to BaseVM's __init__ tests/vm: Add configuration to basevm.py tests/vm: Added configuration file support tests/vm: Add common Ubuntu python module tests/vm: Added a new script for ubuntu.aarch64. tests/vm: Added a new script for centos.aarch64. tests/vm: change scripts to use self._config python/qemu: Add ConsoleSocket for optional use in QEMUMachine tests/vm: Add workaround to consume console configure | 31 +- .gitignore | 1 + .gitlab-ci.d/containers.yml | 250 +++++++++++++ .gitlab-ci.d/edk2.yml | 3 +- .gitlab-ci.d/opensbi.yml | 3 +- .gitlab-ci.yml | 275 +++++++++------ .travis.yml | 23 -- python/qemu/console_socket.py | 110 ++++++ python/qemu/machine.py | 23 +- tests/docker/Makefile.include | 5 +- tests/docker/common.rc | 2 +- tests/docker/docker.py | 27 +- .../dockerfiles/debian-alpha-cross.docker | 2 +- .../dockerfiles/debian-amd64-cross.docker | 2 +- tests/docker/dockerfiles/debian-amd64.docker | 2 +- .../dockerfiles/debian-arm64-cross.docker | 2 +- .../debian-arm64-test-cross.docker | 2 +- .../dockerfiles/debian-armel-cross.docker | 2 +- .../dockerfiles/debian-armhf-cross.docker | 2 +- .../dockerfiles/debian-hppa-cross.docker | 2 +- .../dockerfiles/debian-m68k-cross.docker | 2 +- .../dockerfiles/debian-mips-cross.docker | 2 +- .../dockerfiles/debian-mips64-cross.docker | 2 +- .../dockerfiles/debian-mips64el-cross.docker | 2 +- .../dockerfiles/debian-mipsel-cross.docker | 2 +- .../dockerfiles/debian-powerpc-cross.docker | 2 +- .../dockerfiles/debian-ppc64-cross.docker | 2 +- .../dockerfiles/debian-ppc64el-cross.docker | 2 +- .../dockerfiles/debian-riscv64-cross.docker | 2 +- .../dockerfiles/debian-s390x-cross.docker | 2 +- .../dockerfiles/debian-sh4-cross.docker | 2 +- .../dockerfiles/debian-sparc64-cross.docker | 2 +- .../dockerfiles/debian-tricore-cross.docker | 2 +- .../dockerfiles/debian-win32-cross.docker | 2 +- .../dockerfiles/debian-win64-cross.docker | 2 +- tests/docker/dockerfiles/debian9-mxe.docker | 2 +- tests/qemu-iotests/051.pc.out | 4 +- tests/vm/Makefile.include | 22 ++ tests/vm/aarch64vm.py | 106 ++++++ tests/vm/basevm.py | 332 +++++++++++++----- tests/vm/centos-8-aarch64.ks | 51 +++ tests/vm/centos.aarch64 | 227 ++++++++++++ tests/vm/conf_example_aarch64.yml | 51 +++ tests/vm/conf_example_x86.yml | 50 +++ tests/vm/fedora | 17 +- tests/vm/freebsd | 16 +- tests/vm/netbsd | 19 +- tests/vm/openbsd | 17 +- tests/vm/ubuntu.aarch64 | 68 ++++ tests/vm/ubuntu.i386 | 46 +-- tests/vm/ubuntuvm.py | 60 ++++ 51 files changed, 1565 insertions(+), 322 deletions(-) create mode 100644 .gitlab-ci.d/containers.yml create mode 100644 python/qemu/console_socket.py create mode 100644 tests/vm/aarch64vm.py create mode 100644 tests/vm/centos-8-aarch64.ks create mode 100755 tests/vm/centos.aarch64 create mode 100644 tests/vm/conf_example_aarch64.yml create mode 100644 tests/vm/conf_example_x86.yml create mode 100755 tests/vm/ubuntu.aarch64 create mode 100644 tests/vm/ubuntuvm.py -- 2.20.1