From patchwork Sun Nov 8 22:19:15 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 322385 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-12.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 948C1C4741F for ; Sun, 8 Nov 2020 22:20:57 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 207E4206E3 for ; Sun, 8 Nov 2020 22:20:57 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="aRaFPNY2" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 207E4206E3 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:56644 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kbt3Q-0007Gn-8S for qemu-devel@archiver.kernel.org; Sun, 08 Nov 2020 17:20:56 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:37930) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kbt2A-0005ns-Oo for qemu-devel@nongnu.org; Sun, 08 Nov 2020 17:19:38 -0500 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:26216) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kbt29-000256-9M for qemu-devel@nongnu.org; Sun, 08 Nov 2020 17:19:38 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1604873976; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=jje+QkM8EIIDX196QXsItz5lUhUXvc2nsiwvd/KOGGQ=; b=aRaFPNY2Bhbc7xc3E5w+02ZtcJO3Ol5oSdqQQuDHT2RyqYwol1HNpS95CUTzM3flWlXSEd GiD/KttXot6C2FHoCGYFfbpHZtrsdgFwMKMrB5YIA1apiiUzerZFh4uhOieCU9Lfve0RiW vvCE2UK2fDkNjAxo84rbLx6No3LoEF8= Received: from mail-wr1-f71.google.com (mail-wr1-f71.google.com [209.85.221.71]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-13-IwYHELhnMDCgbfQtpTgjyQ-1; Sun, 08 Nov 2020 17:19:34 -0500 X-MC-Unique: IwYHELhnMDCgbfQtpTgjyQ-1 Received: by mail-wr1-f71.google.com with SMTP id x16so3451661wrg.7 for ; Sun, 08 Nov 2020 14:19:34 -0800 (PST) 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=jje+QkM8EIIDX196QXsItz5lUhUXvc2nsiwvd/KOGGQ=; b=Iqx1700IE156AKwgqCb2cdd0S1kApDtJrcSY3mnH7J5CZxXp0913U8bpCqmwOaorzo jortt0xQnjsuJuFHyy3QnoguP18spPfz84N3f4wnVgU3gCaiSF5TpQp1j7F/Ea4cceGI ALSUdWFvq1KbjH2RRgNrbY6HaSTyhvl7bzBL6NF68azFORiVVZDk2sZ+dGSVleHdBL6C 1IpVwgCp5upExMd0Ov9/zepkCbW6Qw3yDZKkDNcxFdL6wQUcngi4jaRmIJVkhkGcQy+d mIFfLrV4f13oUtHA79uqZe2OrBdpanuCJ7o80hLlcl/YdhAWbjMxXnlCYzZ9bK20Nd31 aqzA== X-Gm-Message-State: AOAM532TiSKH1wuzkaTW4Gq9q8KIXMOsVoXfkaQMxHkTqw2AEibjDwZO EmB7d9rKfKN489DHi/C2uEE1O7srFVr0fUikDsGhPfvq2L/jlKDHX4cBKEBrJFMgkBjdTkIARYt h5pKRudblIDDcRZE= X-Received: by 2002:a1c:97:: with SMTP id 145mr10961972wma.72.1604873972926; Sun, 08 Nov 2020 14:19:32 -0800 (PST) X-Google-Smtp-Source: ABdhPJy3WPOTPx39UY6bBlDIjG81oA9Q+iyhbmk6P7uLuBowaVY/MFR426y1bws7wEEb+LYnBK6RSQ== X-Received: by 2002:a1c:97:: with SMTP id 145mr10961962wma.72.1604873972820; Sun, 08 Nov 2020 14:19:32 -0800 (PST) Received: from localhost.localdomain (234.red-83-42-66.dynamicip.rima-tde.net. [83.42.66.234]) by smtp.gmail.com with ESMTPSA id f8sm10735494wrt.88.2020.11.08.14.19.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 08 Nov 2020 14:19:32 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH v3 01/11] gitlab-ci: Drop generic cache rule Date: Sun, 8 Nov 2020 23:19:15 +0100 Message-Id: <20201108221925.2344515-2-philmd@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20201108221925.2344515-1-philmd@redhat.com> References: <20201108221925.2344515-1-philmd@redhat.com> MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=philmd@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Received-SPF: pass client-ip=216.205.24.124; envelope-from=philmd@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/11/08 15:45:43 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] 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, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=-0.01, RCVD_IN_MSPIKE_WL=-0.01, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no 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: Thomas Huth , "Daniel P . Berrange" , =?utf-8?q?Alex_Benn?= =?utf-8?b?w6ll?= , Wainer dos Santos Moschetta , Cleber Rosa , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" This cache rule is meant for Avocado artifacts, but affects all jobs. Moreover the 'acceptance_template' template already include a more detailled rule to cache artifacts. Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Thomas Huth --- .gitlab-ci.yml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 3b15ae5c302..5763318d375 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -7,12 +7,6 @@ stages: - build - test -# We assume GitLab has it's own caching set up for RPM/APT repositories so we -# just take care of avocado assets here. -cache: - paths: - - $HOME/avocado/data/cache - include: - local: '/.gitlab-ci.d/edk2.yml' - local: '/.gitlab-ci.d/opensbi.yml' From patchwork Sun Nov 8 22:19:17 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 322383 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-17.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, MENTIONS_GIT_HOSTING, SIGNED_OFF_BY, SPF_HELO_NONE, SPF_PASS, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id CD1F4C388F9 for ; Sun, 8 Nov 2020 22:24:11 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 6CE02206E3 for ; Sun, 8 Nov 2020 22:24:11 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="FAPOYfeU" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 6CE02206E3 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:36356 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kbt6Y-0002C0-Hj for qemu-devel@archiver.kernel.org; Sun, 08 Nov 2020 17:24:10 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:37956) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kbt2J-00062N-VO for qemu-devel@nongnu.org; Sun, 08 Nov 2020 17:19:47 -0500 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:24611) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kbt2I-00026j-1v for qemu-devel@nongnu.org; Sun, 08 Nov 2020 17:19:47 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1604873985; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=CmyNUmooLdVHry+yJmzGfzNT00h5DfYz55kuF8g/yME=; b=FAPOYfeULjodTSIkVzms+cywRYtDj1H2AxF6fYnHgleFWSIWNdvC5NlpwUdnrA4YAjigk0 Xd25TG/YwAtib86m1HExCQ6yT309jV+spdKWt4OBL1vBSIOLMLTKqHjB0Ygnig4q1Cg/qe Ft+RWaJhmZF+KOdR1v8Ay3J6iG1xz4A= Received: from mail-wr1-f72.google.com (mail-wr1-f72.google.com [209.85.221.72]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-383-plahqUebP1qA93M9FehATg-1; Sun, 08 Nov 2020 17:19:44 -0500 X-MC-Unique: plahqUebP1qA93M9FehATg-1 Received: by mail-wr1-f72.google.com with SMTP id e11so3478454wrw.14 for ; Sun, 08 Nov 2020 14:19:43 -0800 (PST) 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=CmyNUmooLdVHry+yJmzGfzNT00h5DfYz55kuF8g/yME=; b=gdYespyv2pU7t1mCKTfsVWRzdEqM4tAijCvMG18jbUq5WOX4vBYlJoxe7XHkngsuTG iZc2ZiNKUByU5GjHH59JJkrHbiEgCYy0qykLXCyS6j+48XD46LXcuanDvgNZWWksi0fU Prw1ZWNyHXPts++PYPsh2AF4Swwgbkhiu3B27h083+Kq56iUmzqKf5Q7ozxNu24HlsUj +kqB9y9uazuGm1yKTsLpoti+tuSAXvGGiozyDdPg1OYihErXQ9pmMHfQj4z3ACCFuS6P Q44XyugMBC3RXL7CsTfKo/W9afLLrLJu2T2vq5iIdAA71A5ejyZS7w8k6WLYGOGnfkZr /IOg== X-Gm-Message-State: AOAM531tJoqI4xRPCZdtTSebguQ2n9EyPaWX3/ZE0hi+/HH124LGqVHB aFc04QdDeL0W1TKmGyv3ErvxwLuiLq5sRawy5I6f/AxW9cA5luUcSK7z9G67GKKAqkuPWsdM9zi F5HYuMZ3GSvg9jrQ= X-Received: by 2002:a1c:9dcc:: with SMTP id g195mr11040686wme.113.1604873982715; Sun, 08 Nov 2020 14:19:42 -0800 (PST) X-Google-Smtp-Source: ABdhPJw8rbSR+GAEiCWBZ80Rwovk7pIKZSNYDTFyW3j6X3abJ5ASKZlFvvvDT2ACOZ/VU/1nDSh7qg== X-Received: by 2002:a1c:9dcc:: with SMTP id g195mr11040664wme.113.1604873982495; Sun, 08 Nov 2020 14:19:42 -0800 (PST) Received: from localhost.localdomain (234.red-83-42-66.dynamicip.rima-tde.net. [83.42.66.234]) by smtp.gmail.com with ESMTPSA id l16sm10878402wrx.5.2020.11.08.14.19.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 08 Nov 2020 14:19:41 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH v3 03/11] gitlab-ci: Replace YAML anchors by extends (native_build_job) Date: Sun, 8 Nov 2020 23:19:17 +0100 Message-Id: <20201108221925.2344515-4-philmd@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20201108221925.2344515-1-philmd@redhat.com> References: <20201108221925.2344515-1-philmd@redhat.com> MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=philmd@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Received-SPF: pass client-ip=216.205.24.124; envelope-from=philmd@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/11/08 15:45:43 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] 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, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=-0.01, RCVD_IN_MSPIKE_WL=-0.01, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no 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: Thomas Huth , "Daniel P . Berrange" , =?utf-8?q?Alex_Benn?= =?utf-8?b?w6ll?= , Wainer dos Santos Moschetta , Cleber Rosa , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" 'extends' is an alternative to using YAML anchors and is a little more flexible and readable. See: https://docs.gitlab.com/ee/ci/yaml/#extends Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Wainer dos Santos Moschetta --- .gitlab-ci.yml | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 5763318d375..a96e7dd23e5 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -13,7 +13,7 @@ include: - local: '/.gitlab-ci.d/containers.yml' - local: '/.gitlab-ci.d/crossbuilds.yml' -.native_build_job_template: &native_build_job_definition +.native_build_job: stage: build image: $CI_REGISTRY_IMAGE/qemu/$IMAGE:latest before_script: @@ -68,7 +68,7 @@ include: - du -chs ${CI_PROJECT_DIR}/avocado-cache build-system-ubuntu: - <<: *native_build_job_definition + extends: .native_build_job variables: IMAGE: ubuntu2004 TARGETS: aarch64-softmmu alpha-softmmu cris-softmmu hppa-softmmu @@ -99,7 +99,7 @@ acceptance-system-ubuntu: <<: *acceptance_definition build-system-debian: - <<: *native_build_job_definition + extends: .native_build_job variables: IMAGE: debian-amd64 TARGETS: arm-softmmu avr-softmmu i386-softmmu mipsel-softmmu @@ -130,7 +130,7 @@ acceptance-system-debian: <<: *acceptance_definition build-system-fedora: - <<: *native_build_job_definition + extends: .native_build_job variables: IMAGE: fedora CONFIGURE_ARGS: --disable-gcrypt --enable-nettle @@ -162,7 +162,7 @@ acceptance-system-fedora: <<: *acceptance_definition build-system-centos: - <<: *native_build_job_definition + extends: .native_build_job variables: IMAGE: centos8 CONFIGURE_ARGS: --disable-nettle --enable-gcrypt @@ -194,7 +194,7 @@ acceptance-system-centos: <<: *acceptance_definition build-disabled: - <<: *native_build_job_definition + extends: .native_build_job variables: IMAGE: fedora CONFIGURE_ARGS: --disable-attr --disable-avx2 --disable-bochs @@ -219,7 +219,7 @@ build-disabled: MAKE_CHECK_ARGS: check-qtest SPEED=slow build-tcg-disabled: - <<: *native_build_job_definition + extends: .native_build_job variables: IMAGE: centos8 script: @@ -239,7 +239,7 @@ build-tcg-disabled: 260 261 262 263 264 270 272 273 277 279 build-user: - <<: *native_build_job_definition + extends: .native_build_job variables: IMAGE: debian-all-test-cross CONFIGURE_ARGS: --disable-tools --disable-system @@ -249,7 +249,7 @@ build-user: # we skip sparc64-linux-user until it has been fixed somewhat # we skip cris-linux-user as it doesn't use the common run loop build-user-plugins: - <<: *native_build_job_definition + extends: .native_build_job variables: IMAGE: debian-all-test-cross CONFIGURE_ARGS: --disable-tools --disable-system --enable-plugins --enable-debug-tcg --target-list-exclude=sparc64-linux-user,cris-linux-user @@ -257,7 +257,7 @@ build-user-plugins: timeout: 1h 30m build-clang: - <<: *native_build_job_definition + extends: .native_build_job variables: IMAGE: fedora CONFIGURE_ARGS: --cc=clang --cxx=clang++ @@ -267,7 +267,7 @@ build-clang: # These targets are on the way out build-deprecated: - <<: *native_build_job_definition + extends: .native_build_job variables: IMAGE: debian-all-test-cross CONFIGURE_ARGS: --disable-docs --disable-tools @@ -292,7 +292,7 @@ check-deprecated: allow_failure: true build-oss-fuzz: - <<: *native_build_job_definition + extends: .native_build_job variables: IMAGE: fedora script: @@ -310,7 +310,7 @@ build-oss-fuzz: - cd build-oss-fuzz && make check-qtest-i386 check-unit build-tci: - <<: *native_build_job_definition + extends: .native_build_job variables: IMAGE: fedora script: @@ -335,7 +335,7 @@ build-tci: # These jobs test old gcrypt and nettle from RHEL7 # which had some API differences. build-crypto-old-nettle: - <<: *native_build_job_definition + extends: .native_build_job variables: IMAGE: centos7 TARGETS: x86_64-softmmu x86_64-linux-user @@ -356,7 +356,7 @@ check-crypto-old-nettle: build-crypto-old-gcrypt: - <<: *native_build_job_definition + extends: .native_build_job variables: IMAGE: centos7 TARGETS: x86_64-softmmu x86_64-linux-user @@ -377,7 +377,7 @@ check-crypto-old-gcrypt: build-crypto-only-gnutls: - <<: *native_build_job_definition + extends: .native_build_job variables: IMAGE: centos7 TARGETS: x86_64-softmmu x86_64-linux-user From patchwork Sun Nov 8 22:19:20 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 322382 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-12.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 82DD6C388F9 for ; Sun, 8 Nov 2020 22:26:36 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id E7B10206C1 for ; Sun, 8 Nov 2020 22:26:35 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="hWlBabvL" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org E7B10206C1 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:42122 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kbt8s-0004gF-UL for qemu-devel@archiver.kernel.org; Sun, 08 Nov 2020 17:26:34 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:38002) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kbt2Y-0006Pq-Ia for qemu-devel@nongnu.org; Sun, 08 Nov 2020 17:20:04 -0500 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:51853) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kbt2X-00027h-1Y for qemu-devel@nongnu.org; Sun, 08 Nov 2020 17:20:02 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1604874000; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=9mtvwmDQbHZS+o/2u9r9g/ECxc+lEAZnhg4b7CvVWbM=; b=hWlBabvLGyX2IPp1Tvv1XbK2hr4kTNHK3ezmlYwLwFe5kGuXFcPsDRvLpu013fg9hwvSNE 7G2noUivADLVjZPyksAfGlhzuC3FdMbYtUaVsgHmLliDVrVert3AXVC8srSLDwJRL8FOuW J8c3OIuyr9jP3X0KQkFTohcfmgGFdw4= Received: from mail-wr1-f69.google.com (mail-wr1-f69.google.com [209.85.221.69]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-571-lVbAOaglMDmYxhyaRQTDcg-1; Sun, 08 Nov 2020 17:19:58 -0500 X-MC-Unique: lVbAOaglMDmYxhyaRQTDcg-1 Received: by mail-wr1-f69.google.com with SMTP id t17so3474014wrm.13 for ; Sun, 08 Nov 2020 14:19:58 -0800 (PST) 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=9mtvwmDQbHZS+o/2u9r9g/ECxc+lEAZnhg4b7CvVWbM=; b=SbhXqGybSmg+kv46QTdq4rsLNq3qtNblWqgCDpRqIDxinT8h6nYaL5M5/5NeljWZVk 2tGLzsfoHAnBs/DAyAulYi+Pl1LPbvxNgF0CMcbGAE3+DQGb/zIJKGJJ5xsLsiEkixQx GEQJaQdMfbWflWM8e7HIihnv0gY0S1wCToFecPBHEjlWdECyHtOftzHJGJcUQA+pYmzI LjzAk+Db8Dch45XMv/1/zwmacVjbW6AroWE1vDMNWNaI8eJCZVrDLeh9fHQ1Qt8ltDQ6 HYRt9wsQuoUx0D0nLte3O2ZJrnug4Y/mMELg0aJ2RF5wn5OYvDkW40lMAbfX/BlEvV/K kbsw== X-Gm-Message-State: AOAM533olXbyeJYD62bRIfSR8IUTkGHK4rQHozZpjP9PRv30E7upN0JI xSjsAX5l6DfAD+QWhhcBcx+6i22gPgknKgOZqZZUsP1qCSZrQjAW6IEvgpAUvQsPrQ9gBlxhZnY hRokOeTEr6rQ7dc8= X-Received: by 2002:a7b:c8c9:: with SMTP id f9mr10805561wml.3.1604873997268; Sun, 08 Nov 2020 14:19:57 -0800 (PST) X-Google-Smtp-Source: ABdhPJzakcv/iBkUgS7j1oS0yoV1mLh7oyw+oZKMUHEamTSzjeOgdL/AX9oWy1/cGHnXv6O0INcazg== X-Received: by 2002:a7b:c8c9:: with SMTP id f9mr10805555wml.3.1604873997158; Sun, 08 Nov 2020 14:19:57 -0800 (PST) Received: from localhost.localdomain (234.red-83-42-66.dynamicip.rima-tde.net. [83.42.66.234]) by smtp.gmail.com with ESMTPSA id c2sm10502050wmf.47.2020.11.08.14.19.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 08 Nov 2020 14:19:56 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH v3 06/11] gitlab-ci: Rename acceptance_test_job -> integration_test_job Date: Sun, 8 Nov 2020 23:19:20 +0100 Message-Id: <20201108221925.2344515-7-philmd@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20201108221925.2344515-1-philmd@redhat.com> References: <20201108221925.2344515-1-philmd@redhat.com> MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=philmd@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Received-SPF: pass client-ip=216.205.24.124; envelope-from=philmd@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/11/08 15:45:43 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] 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, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=-0.01, RCVD_IN_MSPIKE_WL=-0.01, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no 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: Thomas Huth , "Daniel P . Berrange" , =?utf-8?q?Alex_Benn?= =?utf-8?b?w6ll?= , Wainer dos Santos Moschetta , Cleber Rosa , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Wainer dos Santos Moschetta Reviewed-by: Willian Rampazzo --- .gitlab-ci.yml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 0ef814764a0..d4526323169 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -42,7 +42,7 @@ include: - find . -type f -exec touch {} + - make $MAKE_CHECK_ARGS -.acceptance_test_job: +.integration_test_job: extends: .native_test_job cache: key: "${CI_JOB_NAME}-cache" @@ -89,8 +89,8 @@ check-system-ubuntu: IMAGE: ubuntu2004 MAKE_CHECK_ARGS: check -acceptance-system-ubuntu: - extends: .acceptance_test_job +integration-system-ubuntu: + extends: .integration_test_job needs: - job: build-system-ubuntu artifacts: true @@ -119,8 +119,8 @@ check-system-debian: IMAGE: debian-amd64 MAKE_CHECK_ARGS: check -acceptance-system-debian: - extends: .acceptance_test_job +integration-system-debian: + extends: .integration_test_job needs: - job: build-system-debian artifacts: true @@ -150,8 +150,8 @@ check-system-fedora: IMAGE: fedora MAKE_CHECK_ARGS: check -acceptance-system-fedora: - extends: .acceptance_test_job +integration-system-fedora: + extends: .integration_test_job needs: - job: build-system-fedora artifacts: true @@ -181,8 +181,8 @@ check-system-centos: IMAGE: centos8 MAKE_CHECK_ARGS: check -acceptance-system-centos: - extends: .acceptance_test_job +integration-system-centos: + extends: .integration_test_job needs: - job: build-system-centos artifacts: true From patchwork Sun Nov 8 22:19:21 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 322384 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-12.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 33B51C4741F for ; Sun, 8 Nov 2020 22:22:01 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id B0B8F20897 for ; Sun, 8 Nov 2020 22:22:00 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="cGLnn50a" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org B0B8F20897 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:59020 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kbt4R-0008ER-R1 for qemu-devel@archiver.kernel.org; Sun, 08 Nov 2020 17:21:59 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:38066) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kbt2g-0006Re-8x for qemu-devel@nongnu.org; Sun, 08 Nov 2020 17:20:11 -0500 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:23056) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kbt2b-00028B-Lq for qemu-devel@nongnu.org; Sun, 08 Nov 2020 17:20:09 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1604874005; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=r+24Qtjsem3z7nn8q0n3COy79qpz54BrkmBsMuZl5LU=; b=cGLnn50a+89gRakUnKQPSuJ84b/zbo1GTe1mgs+ZceJsEdedGjqbg5XfrXlAtQQWDa3RJT xwIXusKvnq/sZ1aRdrdcm5wtWqANwpHa3mLe0/IIdpy+U+TDzutvFZlOiNbBQcCboLdT73 RVa/IGiwpuSaSL095cu3F/WkPto6De0= Received: from mail-wr1-f71.google.com (mail-wr1-f71.google.com [209.85.221.71]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-294-WfB84FCUMxSc2XnfVbgj2A-1; Sun, 08 Nov 2020 17:20:03 -0500 X-MC-Unique: WfB84FCUMxSc2XnfVbgj2A-1 Received: by mail-wr1-f71.google.com with SMTP id e11so3478723wrw.14 for ; Sun, 08 Nov 2020 14:20:03 -0800 (PST) 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=r+24Qtjsem3z7nn8q0n3COy79qpz54BrkmBsMuZl5LU=; b=dcfFAYUBh6ESerzoFasIhldZbAuakrFgBRaziqRibqBRtjFm3uMNhpqtysasCjAFF3 LshqqfUqCqYT1FQwJ8PyJXRyY1v19FVLMQEYH3umqrSHCskmL/gUEdy5/khiDkSLd8kq TNPNFBkiayZ7/d1x5dmdh2n+pmckB+AeXJ+3kuUULTZ0FRfv/kVKAvXT8IEdZtWKxbpE ROEa/r8dDaFXERVvoon6XgfZqits1bPCf41ZbFsw3/BwO2+9nmfWWy50bnOrN77K2M7N LpfZVLI1j518HvG/gCxpXkyDptpKAXScI8bZ/Ux9qklPmD0EF+VoxeG4BZWbNAQvuk8N jynQ== X-Gm-Message-State: AOAM530UhNoXvYU65V5gNOtjoIlusDcV+nUSg+Au9X9xFdt5yoUCFGtk nQkcwyfT0Vp4bOLxaF1RdLDBJfxUO79XIg3eL/GSNNcCut6UIQzEfZJb4Kh/g9UGBY7Kj4+70qo Mzq4TnI//tqlPBMk= X-Received: by 2002:adf:f20f:: with SMTP id p15mr14742653wro.339.1604874002115; Sun, 08 Nov 2020 14:20:02 -0800 (PST) X-Google-Smtp-Source: ABdhPJzIt3uSiJLzk1pUnLGjIVSg22h5INWArBzDzaXS7ePKJTEZIhAOiORr/mcvqbGu2nidIPCFww== X-Received: by 2002:adf:f20f:: with SMTP id p15mr14742638wro.339.1604874001996; Sun, 08 Nov 2020 14:20:01 -0800 (PST) Received: from localhost.localdomain (234.red-83-42-66.dynamicip.rima-tde.net. [83.42.66.234]) by smtp.gmail.com with ESMTPSA id i11sm4135012wrm.1.2020.11.08.14.20.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 08 Nov 2020 14:20:01 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH v3 07/11] gitlab-ci: Extract common job definition as 'cross_common_job' Date: Sun, 8 Nov 2020 23:19:21 +0100 Message-Id: <20201108221925.2344515-8-philmd@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20201108221925.2344515-1-philmd@redhat.com> References: <20201108221925.2344515-1-philmd@redhat.com> MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=philmd@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Received-SPF: pass client-ip=63.128.21.124; envelope-from=philmd@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/11/08 09:03:10 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -30 X-Spam_score: -3.1 X-Spam_bar: --- X-Spam_report: (-3.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H5=-1, RCVD_IN_MSPIKE_WL=-0.01, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no 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: Thomas Huth , "Daniel P . Berrange" , =?utf-8?q?Alex_Benn?= =?utf-8?b?w6ll?= , Wainer dos Santos Moschetta , Cleber Rosa , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Extract the common definitions shared by '.cross_system_build_job' and '.cross_user_build_job' to '.cross_common_job'. Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Wainer dos Santos Moschetta --- .gitlab-ci.d/crossbuilds.yml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/.gitlab-ci.d/crossbuilds.yml b/.gitlab-ci.d/crossbuilds.yml index 099949aaef3..701550f028c 100644 --- a/.gitlab-ci.d/crossbuilds.yml +++ b/.gitlab-ci.d/crossbuilds.yml @@ -1,7 +1,9 @@ - -.cross_system_build_job: +.cross_common_job: stage: build image: $CI_REGISTRY_IMAGE/qemu/$IMAGE:latest + +.cross_system_build_job: + extends: .cross_common_job timeout: 80m script: - mkdir build @@ -14,8 +16,7 @@ - make -j$(expr $(nproc) + 1) all check-build .cross_user_build_job: - stage: build - image: $CI_REGISTRY_IMAGE/qemu/$IMAGE:latest + extends: .cross_common_job script: - mkdir build - cd build From patchwork Sun Nov 8 22:19:24 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 322381 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-17.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, MENTIONS_GIT_HOSTING, SIGNED_OFF_BY, SPF_HELO_NONE, SPF_PASS, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id D9AC0C388F9 for ; Sun, 8 Nov 2020 22:29:23 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 4F414206D8 for ; Sun, 8 Nov 2020 22:29:23 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="MMoFlo2e" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 4F414206D8 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:46596 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kbtBa-0006dY-EY for qemu-devel@archiver.kernel.org; Sun, 08 Nov 2020 17:29:22 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:38130) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kbt2s-0006mo-NI for qemu-devel@nongnu.org; Sun, 08 Nov 2020 17:20:22 -0500 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:46848) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kbt2q-00029O-Ja for qemu-devel@nongnu.org; Sun, 08 Nov 2020 17:20:22 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1604874019; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=s9HYoEsE1qhFP/tebpQUVu8Vr6nBKEoR4i6JyIk0oAs=; b=MMoFlo2erIASxJydWJcWhghI6p3TFM+MeBBgY7HnV506Ak0XMf/dXjx9VQJvrrWXueHMFM PhCI8G+ktLMiWarWO6+a255yzeViVyIR+Vxsyo2iKz3a727ziDCp8Ym7Ehgncl7JKh/INU uy6ytkFvacu4WBB++G9R5IDAl4im0dw= Received: from mail-wr1-f69.google.com (mail-wr1-f69.google.com [209.85.221.69]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-495-j-fqoeT_Oc-t8N7sQhlCYw-1; Sun, 08 Nov 2020 17:20:18 -0500 X-MC-Unique: j-fqoeT_Oc-t8N7sQhlCYw-1 Received: by mail-wr1-f69.google.com with SMTP id v5so3490267wrr.0 for ; Sun, 08 Nov 2020 14:20:17 -0800 (PST) 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=s9HYoEsE1qhFP/tebpQUVu8Vr6nBKEoR4i6JyIk0oAs=; b=OE0WSfLDHSATwxblGulJtD8nm9SsPwJZP/GqnQsbI8dfN4yYLgEVNkLV9XF5HRwmeu BYXgdh2f4kGiYwGuiNaaiceAY5n79Yab8oKkrao6jYujEaJ5Ns+S2hwMUgGZIKSGR1ps 1IfrvF8h80kvA8+3zCEoGBSxcz2eN4NAdEZ2vVTEDOHj3WlHRVPmP9YFq+bcwuAFLs9T Qkpehkm6WITqu+6bf+dwn+PK88JZqIbNDz9IeWN5rgjm5f2LgsDG8fn4HgJNn+T6Wj5R zVAi9bBAM5lmZSPl5hoj9z1Kwj3+hJ56p1g64bEdoJo37nYS+A3NNQfvcTaOjvD3jaIq n5rg== X-Gm-Message-State: AOAM532w6GMuCC5onCtyZG4+avnbcce+k8BllRzi9ZJNxjg5XdDsIbGl rFfinctwpk9bnA4zAmUAAJjALmDdrNEdp1s1ROM2aFXx64BnAOSFgvB9nfoUyq3P9/4I91MXS2O mYfmzVJbDV9vo4N4= X-Received: by 2002:a1c:b006:: with SMTP id z6mr11182997wme.161.1604874016662; Sun, 08 Nov 2020 14:20:16 -0800 (PST) X-Google-Smtp-Source: ABdhPJy19Rm7wxNJgkT5n4tCd100JRTPoqy9lUc2g/F0d1TXFBJtESZs8mo5dzhI/2cY6++QHMSKJw== X-Received: by 2002:a1c:b006:: with SMTP id z6mr11182984wme.161.1604874016470; Sun, 08 Nov 2020 14:20:16 -0800 (PST) Received: from localhost.localdomain (234.red-83-42-66.dynamicip.rima-tde.net. [83.42.66.234]) by smtp.gmail.com with ESMTPSA id i10sm2386316wrs.22.2020.11.08.14.20.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 08 Nov 2020 14:20:15 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH v3 10/11] gitlab-ci: Add rules to select building/testing native jobs Date: Sun, 8 Nov 2020 23:19:24 +0100 Message-Id: <20201108221925.2344515-11-philmd@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20201108221925.2344515-1-philmd@redhat.com> References: <20201108221925.2344515-1-philmd@redhat.com> MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=philmd@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Received-SPF: pass client-ip=216.205.24.124; envelope-from=philmd@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/11/08 15:45:43 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] 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, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=-0.01, RCVD_IN_MSPIKE_WL=-0.01, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no 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: Thomas Huth , "Daniel P . Berrange" , =?utf-8?q?Alex_Benn?= =?utf-8?b?w6ll?= , Wainer dos Santos Moschetta , Cleber Rosa , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Add rules to select various build/test jobs. The following tags are available to restrict CI jobs: - user (user-mode jobs) - system (system-mode jobs) - centos (jobs based on CentOS distribution image) - debian (... Debian) - fedora (... Fedora) - ubuntu (... Ubuntu) - crypto (jobs testing the crypto feature) - tci (jobs testing TCI feature) - fuzz (fuzzer job) - integration (integration tests) - $ARCH (select an architecture: arm/mips/ppc/sparc/...) Developers can combine tags in the QEMU_BUILD variable when pushing a branch (or tag) to repositories. Examples: $ git push -o ci.variable="QEMU_BUILD=user" myrepo mybranch $ git push -o ci.variable="QEMU_BUILD=user,debian,crypto,fuzz" myrepo mybranch References: - https://docs.gitlab.com/ee/ci/yaml/#rulesif - https://docs.gitlab.com/ee/user/project/push_options.html#push-options-for-gitlab-cicd Signed-off-by: Philippe Mathieu-Daudé --- .gitlab-ci.yml | 43 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index f708573884e..dd5f9a4c505 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -15,6 +15,49 @@ include: .native_common_job: image: $CI_REGISTRY_IMAGE/qemu/$IMAGE:latest + rules: + # If the if statement is true, the job is added to the pipeline. + # We only filter for push events + - if: '$CI_PIPELINE_SOURCE != "push"' + # Build all when no variable defined, or set to "all" + - if: $QEMU_BUILD == null || $QEMU_BUILD =~ /^all$/ + # Build specific job name + - if: $QEMU_BUILD == $CI_JOB_NAME + # Build jobs using particular distribution image + - if: $QEMU_BUILD =~ /centos/ && $IMAGE =~ /^centos/ + - if: $QEMU_BUILD =~ /debian/ && $IMAGE =~ /^debian/ + - if: $QEMU_BUILD =~ /fedora/ && $IMAGE =~ /^fedora/ + - if: $QEMU_BUILD =~ /ubuntu/ && $IMAGE =~ /^ubuntu/ + # Build set of jobs by feature + - if: $QEMU_BUILD =~ /system/ && ($TARGETS =~ /softmmu/ || $CONFIGURE_ARGS =~ /disable-user/) + - if: $QEMU_BUILD =~ /user/ && ($TARGETS =~ /user/ || $CONFIGURE_ARGS =~ /disable-system/) + - if: $QEMU_BUILD =~ /integration/ && ($CI_JOB_NAME =~ /^integration/ || $CI_JOB_NAME =~ /^build-system/ || $MAKE_CHECK_ARGS =~ /check-acceptance/) # integration depends on build-system + - if: $QEMU_BUILD =~ /crypto/ && $CI_JOB_NAME =~ /crypto/ + - if: $QEMU_BUILD =~ /tci/ && $CI_JOB_NAME =~ /tci$/ + - if: $QEMU_BUILD =~ /fuzz/ && $CI_JOB_NAME =~ /fuzz$/ + # Build set of jobs by arch + - if: $QEMU_BUILD =~ /aarch64/ && ($CI_JOB_NAME =~ /aarch64/ || $TARGETS =~ /aarch64/) + - if: $QEMU_BUILD =~ /alpha/ && ($CI_JOB_NAME =~ /alpha/ || $TARGETS =~ /alpha/) + - if: $QEMU_BUILD =~ /arm/ && ($CI_JOB_NAME =~ /arm/ || $TARGETS =~ /arm/) + - if: $QEMU_BUILD =~ /avr/ && ($CI_JOB_NAME =~ /avr/ || $TARGETS =~ /avr/) + - if: $QEMU_BUILD =~ /hppa/ && ($CI_JOB_NAME =~ /hppa/ || $TARGETS =~ /hppa/) + - if: $QEMU_BUILD =~ /i386/ && ($CI_JOB_NAME =~ /i386/ || $TARGETS =~ /i386/) + - if: $QEMU_BUILD =~ /lm32/ && ($CI_JOB_NAME =~ /lm32/ || $TARGETS =~ /lm32/) + - if: $QEMU_BUILD =~ /m68k/ && ($CI_JOB_NAME =~ /m68k/ || $TARGETS =~ /m68k/) + - if: $QEMU_BUILD =~ /mips/ && ($CI_JOB_NAME =~ /mips/ || $IMAGE =~ /mips/) + - if: $QEMU_BUILD =~ /ppc/ && ($CI_JOB_NAME =~ /ppc/ || $TARGETS =~ /ppc/) + - if: $QEMU_BUILD =~ /riscv/ && ($CI_JOB_NAME =~ /riscv/ || $TARGETS =~ /riscv/) + - if: $QEMU_BUILD =~ /s390x/ && ($CI_JOB_NAME =~ /s390x/ || $TARGETS =~ /s390x/) + - if: $QEMU_BUILD =~ /sparc/ && ($CI_JOB_NAME =~ /sparc/ || $TARGETS =~ /sparc/) + - if: $QEMU_BUILD =~ /tricore/ && ($CI_JOB_NAME =~ /tricore/ || $TARGETS =~ /tricore/) + - if: $QEMU_BUILD =~ /x86/ && ($CI_JOB_NAME =~ /x86/ || $TARGETS =~ /x86/) + - if: $QEMU_BUILD =~ /xtensa/ && ($CI_JOB_NAME =~ /xtensa/ || $TARGETS =~ /xtensa/) + # In all other cases, do not not execute the job automatically. Note the + # job is not excluded from the pipeline, user can still start it manually. + # As the job is optional, we have to mark it 'allow_failure' to not block + # the pipeline. + - when: manual + allow_failure: true .native_build_job: extends: .native_common_job From patchwork Sun Nov 8 22:19:25 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 322380 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-12.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 93B4FC388F9 for ; Sun, 8 Nov 2020 22:31:17 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 183D5206D8 for ; Sun, 8 Nov 2020 22:31:17 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="XUeVrr4B" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 183D5206D8 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:50264 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kbtDP-0008HY-S4 for qemu-devel@archiver.kernel.org; Sun, 08 Nov 2020 17:31:16 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:38144) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kbt2x-0006x5-3y for qemu-devel@nongnu.org; Sun, 08 Nov 2020 17:20:28 -0500 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:41145) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kbt2v-0002Am-BV for qemu-devel@nongnu.org; Sun, 08 Nov 2020 17:20:26 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1604874024; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Sj6sIGQ+9d93c4eo42RqcVAC/Mp3MEsUUct8oxUxgjw=; b=XUeVrr4BjqaGQQFeOPWPUKcZlCEoMmmhcO6qqD9fsBkZsbDggZkwi8RBz3p9qdwpR1o844 nGueJ2yznrzkFe2K+AoGKfK9cn/54LhbPmzxZYBQ2CExplES1BU4+1QgEDDtzPAnDZAP9j AjKXbeecUIzL3+6u0shM9D3JFmtwyIo= Received: from mail-wm1-f71.google.com (mail-wm1-f71.google.com [209.85.128.71]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-514-sebKj8YUM5qjgoZ7LhkmRA-1; Sun, 08 Nov 2020 17:20:22 -0500 X-MC-Unique: sebKj8YUM5qjgoZ7LhkmRA-1 Received: by mail-wm1-f71.google.com with SMTP id z62so2844469wmb.1 for ; Sun, 08 Nov 2020 14:20:22 -0800 (PST) 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=Sj6sIGQ+9d93c4eo42RqcVAC/Mp3MEsUUct8oxUxgjw=; b=unc9iH1kjKU0WV/Il1WNxeKfLxENQuB/JsbTf0NdcChVpbP2/Jdb504p/tfPIr1tCY fQop00uR7rUEWylVZMwv+r1q9wLvmc/SnJ7BKVDLScFixHaqqNifNVJ8lgMEMIoqh7iT XVy8iry+uWlLT21VvZ5Nii6AoaTHhbiMz32W3VUPUBYOcyd15GOeLpo1Dbt/+RNi38Cb zln6fenw03+bi9DY5Sm9VAtmwsZS8Xs+L3/bM6PQkmjg9gQ2FgJZUPWDYW7WHySDBx0c 3uAt9WvX+ayXkFJdNByThH4+prKuuNqwqhAcEK3+CX2KCS4A0+aSrINsOxpMbAKXA+Jy 3kIQ== X-Gm-Message-State: AOAM531CVDmQ9J/fXIRRxI0Ck/2geHenOuBOxY0tMos9TZkOqfDK690C kDmqN4XOygN93z9WXmiwj9yrPPzqHzDrX0O0DCYQlSnsmRHNtq1EESulrh+WaabFNLJ4ze1ZiRJ fcBFwXZUFnPRi8iw= X-Received: by 2002:a1c:7301:: with SMTP id d1mr11098777wmb.141.1604874021467; Sun, 08 Nov 2020 14:20:21 -0800 (PST) X-Google-Smtp-Source: ABdhPJwGsNFbiyKismeVoSLSRY7716hgfdpx1TS84pPTb6hztL7bjQRmgZm9HctpUVU5/SXdH23bAQ== X-Received: by 2002:a1c:7301:: with SMTP id d1mr11098767wmb.141.1604874021318; Sun, 08 Nov 2020 14:20:21 -0800 (PST) Received: from localhost.localdomain (234.red-83-42-66.dynamicip.rima-tde.net. [83.42.66.234]) by smtp.gmail.com with ESMTPSA id b8sm10277743wmj.9.2020.11.08.14.20.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 08 Nov 2020 14:20:20 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH v3 11/11] gitlab-ci: Move artifacts expiry rule to common 'native_build_job' Date: Sun, 8 Nov 2020 23:19:25 +0100 Message-Id: <20201108221925.2344515-12-philmd@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20201108221925.2344515-1-philmd@redhat.com> References: <20201108221925.2344515-1-philmd@redhat.com> MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=philmd@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Received-SPF: pass client-ip=63.128.21.124; envelope-from=philmd@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/11/08 09:03:10 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -30 X-Spam_score: -3.1 X-Spam_bar: --- X-Spam_report: (-3.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H5=-1, RCVD_IN_MSPIKE_WL=-0.01, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no 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: Thomas Huth , "Daniel P . Berrange" , =?utf-8?q?Alex_Benn?= =?utf-8?b?w6ll?= , Wainer dos Santos Moschetta , Cleber Rosa , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Build jobs include the 'native_build_job' template. Move the 'artifacts expiry' rule there. Now all build jobs benefit from it. Signed-off-by: Philippe Mathieu-Daudé --- .gitlab-ci.yml | 24 ++++-------------------- 1 file changed, 4 insertions(+), 20 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index dd5f9a4c505..27a4cbc5171 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -79,6 +79,10 @@ include: then make -j"$JOBS" $MAKE_CHECK_ARGS ; fi + artifacts: + expire_in: 2 days + paths: + - build .native_test_job: extends: .native_common_job @@ -121,10 +125,6 @@ build-system-ubuntu: TARGETS: aarch64-softmmu alpha-softmmu cris-softmmu hppa-softmmu moxie-softmmu microblazeel-softmmu mips64el-softmmu MAKE_CHECK_ARGS: check-build - artifacts: - expire_in: 2 days - paths: - - build check-system-ubuntu: extends: .native_test_job @@ -151,10 +151,6 @@ build-system-debian: TARGETS: arm-softmmu avr-softmmu i386-softmmu mipsel-softmmu riscv64-softmmu sh4eb-softmmu sparc-softmmu xtensaeb-softmmu MAKE_CHECK_ARGS: check-build - artifacts: - expire_in: 2 days - paths: - - build check-system-debian: extends: .native_test_job @@ -182,10 +178,6 @@ build-system-fedora: TARGETS: tricore-softmmu microblaze-softmmu mips-softmmu xtensa-softmmu m68k-softmmu riscv32-softmmu ppc-softmmu sparc64-softmmu MAKE_CHECK_ARGS: check-build - artifacts: - expire_in: 2 days - paths: - - build check-system-fedora: extends: .native_test_job @@ -213,10 +205,6 @@ build-system-centos: TARGETS: ppc64-softmmu or1k-softmmu s390x-softmmu x86_64-softmmu rx-softmmu sh4-softmmu nios2-softmmu MAKE_CHECK_ARGS: check-build - artifacts: - expire_in: 2 days - paths: - - build check-system-centos: extends: .native_test_job @@ -317,10 +305,6 @@ build-deprecated: MAKE_CHECK_ARGS: build-tcg TARGETS: ppc64abi32-linux-user tilegx-linux-user lm32-softmmu unicore32-softmmu - artifacts: - expire_in: 2 days - paths: - - build # We split the check-tcg step as test failures are expected but we still # want to catch the build breaking.