From patchwork Fri Jun 26 18:13:51 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: 191906 Delivered-To: patch@linaro.org Received: by 2002:a54:3249:0:0:0:0:0 with SMTP id g9csp653398ecs; Fri, 26 Jun 2020 11:27:16 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwDHKonaBi26yoOl5CAx+10WSjOmG8vv2xEZeVdEj8u3rcXICSktby9FT4GE+tpQYmYVH0O X-Received: by 2002:a25:c101:: with SMTP id r1mr6907317ybf.112.1593196036267; Fri, 26 Jun 2020 11:27:16 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1593196036; cv=none; d=google.com; s=arc-20160816; b=bNTvFSnqFpe30/xk5cypBZPJ+m7ogirI/FB3B3dWTQt0mVNbkl1OEis9Ex6A/YLABo xsZaSxPcAqlqOLbyzZnQmU+j3QP0Slzot+TnFDxl2eI7kuy1+BP8zO4cwRI/nseWqqPV QJcEBbqwYY+GDkUoQt1m45BSfSLvUNZEE6iQj8bOq1h+mxd9c1Dp+19Eu78y+Y2fmZkN +WqX9a4HJKreJIsiqaJorfjEJ8Qo3BDM8jflw81CbVzPTylDrh1wYtpiuWvbpqYYwfo1 eozRbwtwFEu6VoFF3pGXEp/4QIHj6gkkYqjPeTHY+4uQGw/GnwO4en5mZ1nwzttYIaT0 LMHg== 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=8+ywLSq/cpQR9jk1x4FDeODnKkLS2LjIS17ZB0FsQ2E=; b=b95OnVmn3rmtX1lCVQonCb0R9Q9TlLeWmECdwbaLeGy90a0tXy6WOHT6nxSJ6MegAL RfxEJutx871Gqx+Pc3yOBHLuqZOc54m7oaLkC2vPI7J2ouBl+aOSKfmPGjsCchFeqob7 0ua9YrPAdL/ivfFyA0eAA9KeVAT8kvY6EAFSWaE4uxq5PqxaKPMwzAtUTVuKleMvRoTT +bNxnGprMHNKnwipBbxo6Bbefm4ac4daeQ8IuFtjHIf+BQrLy/BWl58U/e8K6nQplfIZ ZXoo6TDhp+hSIdfrMFjajOPyQzK3/uW7PpaZEwM9F8rFQ1rhyB+3YQO/Qwa20TEWLWuN flNQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=t2VuEGbP; 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 e3si25391419ybr.362.2020.06.26.11.27.16 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 26 Jun 2020 11:27:16 -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=t2VuEGbP; 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]:59302 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jot4F-00020w-MB for patch@linaro.org; Fri, 26 Jun 2020 14:27:15 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58398) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jot0G-0003rI-LN for qemu-devel@nongnu.org; Fri, 26 Jun 2020 14:23:08 -0400 Received: from mail-wr1-x434.google.com ([2a00:1450:4864:20::434]:34635) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jot0E-00058K-JQ for qemu-devel@nongnu.org; Fri, 26 Jun 2020 14:23:08 -0400 Received: by mail-wr1-x434.google.com with SMTP id f7so7385006wrw.1 for ; Fri, 26 Jun 2020 11:23:06 -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=8+ywLSq/cpQR9jk1x4FDeODnKkLS2LjIS17ZB0FsQ2E=; b=t2VuEGbPaVY2reVVq1TouABum0h/TkvNxEmYOmFMPu6EqOygHm0DfKVYcEsACMkk5e OLz+p1yxJVimcULfYgCMU/ac3a1IftHMuZSLZY5rJGSEJIBh3hRkdtXZvbj5At3qe3iS WSg+QUOlMNQ03meX2oqUIdrODWd0fvlN057PKexc2/v9a8gQuSN6NM0RVMXj+65u6unZ uujj36fyCdpp4cAXjCcd2baOCPwieNS6dJt4KMU2Wyhh8TKrmRaGUBcXbvjbxHvfHqua rw/711UqyQJSSN7i3E0qQqJLDXax6WtJD1LXq9MN9NT6lIwmlpgC5pOkTlUHrkDeTF28 kivA== 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=8+ywLSq/cpQR9jk1x4FDeODnKkLS2LjIS17ZB0FsQ2E=; b=ZfwMHwOfKqHfhV+n51MaMGBGO9kFqeuBQDudS25RFTxZPhMyRm5s1blrjhoH1v7Fa1 DP5CWzfrE6p+6UqUXJ3GRJHmo3NX2D+KxjCpjb8rS30MgYph7npoTIcFSRwNNp+GyLT6 3ywoMSPdEZkiuv1NzakfWRlUFD7OSlrDsbjinIo9tXbdecPoAgZn8dI9EFWOL57FaFYF 3bm2rVKCD+NYiYRVHN59IYj99Qhnrh5pik4ONNh2UMNonCzajzBwTSUaqnlRJTwA0/A9 b/aQ067CAmsEd7FTdAS7jqwgx9WJLBwUDuQ8jZ9JhuaUiYsuf5o6yLDGDYR/XAhIBMSu cpgQ== X-Gm-Message-State: AOAM531XLgtcoaTSIwypQ0UBB9x5mdOPZBjSxWXWU3cGN5ZODwTMHX5e 60J4JsepjqevNuhdMFYX9DTp3Q== X-Received: by 2002:adf:82f5:: with SMTP id 108mr5009572wrc.218.1593195785203; Fri, 26 Jun 2020 11:23:05 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id 11sm18436613wmg.41.2020.06.26.11.22.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 26 Jun 2020 11:22:57 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id E3C381FFAB; Fri, 26 Jun 2020 19:14:02 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v3 24/30] gitlab: add acceptance testing to system builds Date: Fri, 26 Jun 2020 19:13:51 +0100 Message-Id: <20200626181357.26211-25-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::434; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x434.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, Thomas Huth , berrange@redhat.com, =?utf-8?q?Alex_Benn=C3=A9e?= , richard.henderson@linaro.org, f4bug@amsat.org, Wainer dos Santos Moschetta , =?utf-8?q?Philippe_Mathieu-Daud?= =?utf-8?b?w6k=?= , cota@braap.org, aurelien@aurel32.net Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" As part of migrating things from Travis to GitLab add the acceptance tests. To do this: - rename system1 to system-ubuntu-main - rename system2 to system-fedora-misc - split into build/check/acceptance - remove -j from check stages - use artifacts to save build stage - add post acceptance template and use Signed-off-by: Alex Bennée Message-Id: <20200622143204.12921-16-alex.bennee@linaro.org> --- v2 - updated with danp's docker changes - use needs instead of dependancies - touch all the build files to prevent rebuild --- .gitlab-ci.yml | 66 +++++++++++++++++++++++++++++++++++++++++++++++--- .travis.yml | 23 ------------------ 2 files changed, 63 insertions(+), 26 deletions(-) -- 2.20.1 Reviewed-by: Philippe Mathieu-Daudé diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a7abc55a5c6..5ae8130bd1a 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,8 +1,12 @@ +# Currently we have two build stages after our containers are built: +# - build (for traditional build and test or first stage build) +# - test (for test stages, using build artefacts from a build stage) stages: - containers - containers-layer2 - containers-layer3 - build + - test include: - local: '/.gitlab-ci.d/edk2.yml' @@ -24,26 +28,82 @@ include: ../configure --enable-werror $CONFIGURE_ARGS ; fi - make -j"$JOBS" - - make -j"$JOBS" $MAKE_CHECK_ARGS + - if test -n "$MAKE_CHECK_ARGS"; + then + make $MAKE_CHECK_ARGS ; + fi + +.native_test_job_template: &native_test_job_definition + stage: test + image: $CI_REGISTRY_IMAGE/qemu/$IMAGE:latest + script: + - cd build + - find . -type f -exec touch {} + + - make $MAKE_CHECK_ARGS + +.post_acceptance_template: &post_acceptance + after_script: + - python3 -c 'import json; r = json.load(open("tests/results/latest/results.json")); [print(t["logfile"]) for t in r["tests"] if t["status"] not in ("PASS", "SKIP")]' | xargs cat + - du -chs $HOME/avocado/data/cache -build-system1: +build:system-ubuntu-main: <<: *native_build_job_definition variables: IMAGE: ubuntu2004 TARGETS: aarch64-softmmu alpha-softmmu cris-softmmu hppa-softmmu lm32-softmmu moxie-softmmu microblazeel-softmmu mips64el-softmmu m68k-softmmu ppc-softmmu riscv64-softmmu sparc-softmmu + artifacts: + paths: + - build + +check:system-ubuntu-main: + <<: *native_test_job_definition + needs: + - job: build:system-ubuntu-main + artifacts: true + variables: + IMAGE: ubuntu2004 MAKE_CHECK_ARGS: check -build-system2: +acceptance:system-ubuntu-main: + <<: *native_test_job_definition + needs: + - job: build:system-ubuntu-main + artifacts: true + variables: + IMAGE: ubuntu2004 + MAKE_CHECK_ARGS: check-acceptance + +build:system-fedora-alt: <<: *native_build_job_definition variables: IMAGE: fedora TARGETS: tricore-softmmu unicore32-softmmu microblaze-softmmu mips-softmmu riscv32-softmmu s390x-softmmu sh4-softmmu sparc64-softmmu x86_64-softmmu xtensa-softmmu nios2-softmmu or1k-softmmu + artifacts: + paths: + - build + +check:system-fedora-alt: + <<: *native_test_job_definition + needs: + - job: build:system-fedora-alt + artifacts: true + variables: + IMAGE: fedora MAKE_CHECK_ARGS: check +check:system-fedora-alt: + <<: *native_test_job_definition + needs: + - job: build:system-fedora-alt + artifacts: true + variables: + IMAGE: fedora + MAKE_CHECK_ARGS: check-acceptance + build-disabled: <<: *native_build_job_definition variables: diff --git a/.travis.yml b/.travis.yml index 74158f741b1..c24dfbe377f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -289,29 +289,6 @@ jobs: python: 3.6 - # Acceptance (Functional) tests - - name: "GCC check-acceptance" - dist: bionic - env: - - CONFIG="--enable-tools --target-list=aarch64-softmmu,alpha-softmmu,arm-softmmu,m68k-softmmu,microblaze-softmmu,mips-softmmu,mips64el-softmmu,nios2-softmmu,or1k-softmmu,ppc-softmmu,ppc64-softmmu,s390x-softmmu,sh4-softmmu,sparc-softmmu,x86_64-softmmu,xtensa-softmmu" - - TEST_CMD="make check-acceptance" - - CACHE_NAME="${TRAVIS_BRANCH}-linux-gcc-acceptance" - after_script: - - python3 -c 'import json; r = json.load(open("tests/results/latest/results.json")); [print(t["logfile"]) for t in r["tests"] if t["status"] not in ("PASS", "SKIP")]' | xargs cat - - du -chs $HOME/avocado/data/cache - addons: - apt: - packages: - - python3-pil - - python3-pip - - python3-numpy - - python3-opencv - - python3-venv - - rpm2cpio - - tesseract-ocr - - tesseract-ocr-eng - - # Using newer GCC with sanitizers - name: "GCC9 with sanitizers (softmmu)" addons: