From patchwork Wed Nov 4 22:45:51 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: 318566 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.5 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, URIBL_BLOCKED, 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 C2CC0C2D0A3 for ; Wed, 4 Nov 2020 22:48: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 2E0432080D for ; Wed, 4 Nov 2020 22:48:01 +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="BC7cpdqv" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 2E0432080D 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]:46288 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kaRZQ-0006b9-3h for qemu-devel@archiver.kernel.org; Wed, 04 Nov 2020 17:48:00 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:41062) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kaRXm-0004zv-3h for qemu-devel@nongnu.org; Wed, 04 Nov 2020 17:46:18 -0500 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:37139) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kaRXj-0006un-TS for qemu-devel@nongnu.org; Wed, 04 Nov 2020 17:46:17 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1604529974; 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=vsIvdkHwnKN3ES/j+SRDmVheqNblhIaZFAjIMTXNIXk=; b=BC7cpdqvDzDi+CKsjfEK0i7j3fwQyYgiLQ+fkDDWLlCrE90wbURWsueKVo27xClApAdW+A //3Mi8GJN6uzh3Yx0oFHdQ50DOgLi4Oe8Flfmf74d9jvwAESjkA++vfanKa2aaty1xD+9a 4X6BSfQllI+Qai6rFs+W65pqaU1lE2Y= Received: from mail-wm1-f72.google.com (mail-wm1-f72.google.com [209.85.128.72]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-506-nmgzz7oxOGSpHiV1nw2yPA-1; Wed, 04 Nov 2020 17:46:12 -0500 X-MC-Unique: nmgzz7oxOGSpHiV1nw2yPA-1 Received: by mail-wm1-f72.google.com with SMTP id c10so1808348wmh.6 for ; Wed, 04 Nov 2020 14:46:12 -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=vsIvdkHwnKN3ES/j+SRDmVheqNblhIaZFAjIMTXNIXk=; b=Ps3lQL0uXbWxsym37rh+sADA5dk53UigzlrjuEg+TL3amxFyLUzX04G2YQIyFmySNt XOZhQ/WFqs216YKYnCYz9apccFmmFuaKclirOdH9mWPriNCm/QngzHVVV9tXjDFF51ns p9Lr3wqKAvssKw/Q1MQ/ssRqQq7xOOMcmzqgawKffbqLvKbHg4kWSy9ZOmxPl3mp64y8 NXFTNt31WT0rg3FNCdKZgWOYwpH3ybXKZffOxY+h95O/TiTl0f0vewIxemff+8k2l4PU Wr/gyOC5nmd3aUmm0gxfzP4jXWAmgQo3BWM+KkgvlRZxKhJTOpHtng/yjFmIVMX9cGKF 9rWg== X-Gm-Message-State: AOAM532NXycaBS4lrQjipt0eQx6zPG1drXtiEY+COIQReGCT+qBJxLxP TUADaEn2zCDwxi6Tv9gnSpu4csqQzQxCXw3xWjTT2HDTw9yPuI98PZo0jVQdHDjt+IJLx31Mq23 okxKeQVO0s9j9DQY= X-Received: by 2002:a1c:4c0a:: with SMTP id z10mr5756194wmf.96.1604529971300; Wed, 04 Nov 2020 14:46:11 -0800 (PST) X-Google-Smtp-Source: ABdhPJw3sDhuJuuobcSW+Fw6a4iU+c/lDx9jzHthNB2Hi4OpfK0MQKD5Q5ir9eznjmIGZAKG9NlAZA== X-Received: by 2002:a1c:4c0a:: with SMTP id z10mr5756179wmf.96.1604529971141; Wed, 04 Nov 2020 14:46:11 -0800 (PST) Received: from x1w.redhat.com (234.red-83-42-66.dynamicip.rima-tde.net. [83.42.66.234]) by smtp.gmail.com with ESMTPSA id t74sm3778774wmt.8.2020.11.04.14.46.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 04 Nov 2020 14:46:10 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [RFC PATCH 2/9] gitlab-ci: Replace YAML anchors by extends (native_build_job) Date: Wed, 4 Nov 2020 23:45:51 +0100 Message-Id: <20201104224558.3384595-3-philmd@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20201104224558.3384595-1-philmd@redhat.com> References: <20201104224558.3384595-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/03 22:09:52 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_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, 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: Peter Maydell , Thomas Huth , "Daniel P . Berrange" , John Snow , Cornelia Huck , Wainer dos Santos Moschetta , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , =?utf-8?q?Alex_Benn=C3=A9e?= 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é --- .gitlab-ci.yml | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 3b15ae5c302..ff3a8bd58cf 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -19,7 +19,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: @@ -74,7 +74,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 @@ -105,7 +105,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 @@ -136,7 +136,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 @@ -168,7 +168,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 @@ -200,7 +200,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 @@ -225,7 +225,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: @@ -245,7 +245,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 @@ -255,7 +255,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 @@ -263,7 +263,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++ @@ -273,7 +273,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 @@ -298,7 +298,7 @@ check-deprecated: allow_failure: true build-oss-fuzz: - <<: *native_build_job_definition + extends: .native_build_job variables: IMAGE: fedora script: @@ -316,7 +316,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: @@ -341,7 +341,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 @@ -362,7 +362,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 @@ -383,7 +383,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 Wed Nov 4 22:45:53 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: 318565 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.5 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, URIBL_BLOCKED, 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 A5502C2D0A3 for ; Wed, 4 Nov 2020 22:48:05 +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 1CF4720867 for ; Wed, 4 Nov 2020 22:48:05 +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="hfnORgKA" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 1CF4720867 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]:46692 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kaRZU-0006l7-4D for qemu-devel@archiver.kernel.org; Wed, 04 Nov 2020 17:48:04 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:41146) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kaRY3-00055t-7D for qemu-devel@nongnu.org; Wed, 04 Nov 2020 17:46:35 -0500 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:46224) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kaRXz-0006vz-06 for qemu-devel@nongnu.org; Wed, 04 Nov 2020 17:46:34 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1604529985; 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=ZKfst5p/Yonp+OSkXV2uundvG0uzrAH2pf1hHzEsgM4=; b=hfnORgKAyH4OJodCb8yIDi4OolJSkvIMFZjbezGofU5VRyTlBfY9R50jf+X8o1e6M04y0Y J/CWgpH9aVPy/91AniuqggqJXJ2LetAhbMC4DCyQZ6LP/H4Li2RRoRgrIXxUC9Zjf3FKAb gjQJd96AVhr6V4ATgZ4QB1MTe1K5Qtw= Received: from mail-wr1-f70.google.com (mail-wr1-f70.google.com [209.85.221.70]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-293--0hy2ukrNsi9WKPRiZcSww-1; Wed, 04 Nov 2020 17:46:23 -0500 X-MC-Unique: -0hy2ukrNsi9WKPRiZcSww-1 Received: by mail-wr1-f70.google.com with SMTP id w1so18944wrr.5 for ; Wed, 04 Nov 2020 14:46:23 -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=ZKfst5p/Yonp+OSkXV2uundvG0uzrAH2pf1hHzEsgM4=; b=p4zdzl0/3j2aSnSRz2Z4IkVOBSyeANuI6NkGWc/sAGg0oLkju35X1H3dXxkda848l6 9W5jHiY3DJl4hqQv/uxiTkDq1+f0UVadRtfjB/wnoarlUrDM51Il9pl1jRgUepNj6tBk 5OLP417k6CtzK8uAh3BujTFNUU/KoUXKM+GiRUkMajrj/Fg9Myhm9m0hs7d67tKsXHSY 6ivE8XVuJTevSpuIijxJMNJ6XGSm+xCh0pEhBVMiHX/X9bUlig8SX0+GA6qUDosbWrPn 9vMuN8xDb72MCskOCtsFQJ72cBESyR3qYkZKlOv/tMorahxVtKZU8w1g45vsSmbpbAsc WHUw== X-Gm-Message-State: AOAM531ZJvJL87h4E9YghIqlkJKE34DiiOpLXGQ1oZMEZVnU8f6DZoXB Rs5QQydpwStsAuU/omtJhytY10GIl8v5XI9AZcDsi7gyvv205HRWkqLpNqeeeUylYImCDwoNb3N Yi276RiteG9GcP5k= X-Received: by 2002:adf:9d44:: with SMTP id o4mr237731wre.229.1604529982196; Wed, 04 Nov 2020 14:46:22 -0800 (PST) X-Google-Smtp-Source: ABdhPJyLWgFBRsIxOORcIl8oGxoHMtQohAZNd6JQsf9KAYKSjAODunQq//FHmHWUQ5ouji8micahOg== X-Received: by 2002:adf:9d44:: with SMTP id o4mr237719wre.229.1604529982047; Wed, 04 Nov 2020 14:46:22 -0800 (PST) Received: from x1w.redhat.com (234.red-83-42-66.dynamicip.rima-tde.net. [83.42.66.234]) by smtp.gmail.com with ESMTPSA id y10sm4813357wru.94.2020.11.04.14.46.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 04 Nov 2020 14:46:21 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [RFC PATCH 4/9] gitlab-ci: Replace YAML anchors by extends (acceptance_test_job) Date: Wed, 4 Nov 2020 23:45:53 +0100 Message-Id: <20201104224558.3384595-5-philmd@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20201104224558.3384595-1-philmd@redhat.com> References: <20201104224558.3384595-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/03 00:03:41 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.001, RCVD_IN_MSPIKE_WL=0.001, 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: Peter Maydell , Thomas Huth , "Daniel P . Berrange" , John Snow , Cornelia Huck , Wainer dos Santos Moschetta , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , =?utf-8?q?Alex_Benn=C3=A9e?= 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é --- .gitlab-ci.yml | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 83beefa2c85..5c64e477c9d 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -48,7 +48,8 @@ include: - find . -type f -exec touch {} + - make $MAKE_CHECK_ARGS -.acceptance_template: &acceptance_definition +.acceptance_test_job: + extends: .native_test_job cache: key: "${CI_JOB_NAME}-cache" paths: @@ -95,14 +96,13 @@ check-system-ubuntu: MAKE_CHECK_ARGS: check acceptance-system-ubuntu: - extends: .native_test_job + extends: .acceptance_test_job needs: - job: build-system-ubuntu artifacts: true variables: IMAGE: ubuntu2004 MAKE_CHECK_ARGS: check-acceptance - <<: *acceptance_definition build-system-debian: extends: .native_build_job @@ -126,14 +126,13 @@ check-system-debian: MAKE_CHECK_ARGS: check acceptance-system-debian: - extends: .native_test_job + extends: .acceptance_test_job needs: - job: build-system-debian artifacts: true variables: IMAGE: debian-amd64 MAKE_CHECK_ARGS: check-acceptance - <<: *acceptance_definition build-system-fedora: extends: .native_build_job @@ -158,14 +157,13 @@ check-system-fedora: MAKE_CHECK_ARGS: check acceptance-system-fedora: - extends: .native_test_job + extends: .acceptance_test_job needs: - job: build-system-fedora artifacts: true variables: IMAGE: fedora MAKE_CHECK_ARGS: check-acceptance - <<: *acceptance_definition build-system-centos: extends: .native_build_job @@ -190,14 +188,13 @@ check-system-centos: MAKE_CHECK_ARGS: check acceptance-system-centos: - extends: .native_test_job + extends: .acceptance_test_job needs: - job: build-system-centos artifacts: true variables: IMAGE: centos8 MAKE_CHECK_ARGS: check-acceptance - <<: *acceptance_definition build-disabled: extends: .native_build_job From patchwork Wed Nov 4 22:45:55 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: 318564 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 224D5C388F7 for ; Wed, 4 Nov 2020 22:50:19 +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 892C3207BB for ; Wed, 4 Nov 2020 22:50:18 +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="ilubzx2a" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 892C3207BB 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]:53846 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kaRbd-0001Ef-Hw for qemu-devel@archiver.kernel.org; Wed, 04 Nov 2020 17:50:17 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:41190) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kaRY7-0005GD-Fc for qemu-devel@nongnu.org; Wed, 04 Nov 2020 17:46:39 -0500 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:50882) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kaRY5-0006xI-Jn for qemu-devel@nongnu.org; Wed, 04 Nov 2020 17:46:39 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1604529996; 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=ilubzx2avMqTYumjlFCh5toCK8FMSqjqmt4FNTtCSlZFch4UPBH9tfRsM+Pff1xvZsAYWg KvE6UFZ74wGD6zjZhe/mWwwVhclx6I3I5Sq3WknpB2IbdAuoeYUTgXdd5W5dHpCwP0PngE huIBhLnH7aR+XyFBkCBnO/mF/Bc8A0M= 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-412-JW9yMqbGOaeralBmGXbkdA-1; Wed, 04 Nov 2020 17:46:35 -0500 X-MC-Unique: JW9yMqbGOaeralBmGXbkdA-1 Received: by mail-wr1-f69.google.com with SMTP id e11so10422wrw.14 for ; Wed, 04 Nov 2020 14:46:33 -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=NZxH00GcYgeW+mqu+BiIGXghm60+t+qllAhd5WCGLbWFnEcSrqp7/y7tVUxb+yms8h ws8BKDcFVCQHCBj/TWXcmRRVpu7tbR53OzjcmlzNgztuRiEsOAJrljN7RxVP8ix4TTnX QMFFHrkf5/xhRkhSNpHXtMgGio3avSNLpjqwdh6id72vefy5/YWG3ePKgXkkZAzKUVbv s7l09cSaRDGV9FZqhNinsmTH5ov5bNFJheg6dcGnQBhXBVhIBxvYwVgsbF2rJH4wkC6F kwJFrYSv4uSWSDgksOzj3v+BLeyQfWxlB6CB4YKLsbkTG5bCP5Jkw6rlA+oyfPvDOdBo K6Nw== X-Gm-Message-State: AOAM532GS59nDOJYfOsKDtizu41OuwBIe+aE+ELZaYVvdd5Wkxhm7dux F348YSPRVrW0jCfLaZ4tOIRAnOc5IJ4e+3TEkWSYaHq9JzgjucfhFWcMfLK25NWRKllhBlBW6tG xmEInyQG6h1QU+BQ= X-Received: by 2002:adf:804e:: with SMTP id 72mr274293wrk.114.1604529992805; Wed, 04 Nov 2020 14:46:32 -0800 (PST) X-Google-Smtp-Source: ABdhPJyoqEIJlICdXi9aLQrC+AalYxUawOa4VgrsMJCszoi1YeaLR2L1VdYivyoH/zVt4CmQv0Al7w== X-Received: by 2002:adf:804e:: with SMTP id 72mr274272wrk.114.1604529992674; Wed, 04 Nov 2020 14:46:32 -0800 (PST) Received: from x1w.redhat.com (234.red-83-42-66.dynamicip.rima-tde.net. [83.42.66.234]) by smtp.gmail.com with ESMTPSA id o3sm4502572wru.15.2020.11.04.14.46.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 04 Nov 2020 14:46:32 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [RFC PATCH 6/9] gitlab-ci: Extract common job definition as 'cross_common_job' Date: Wed, 4 Nov 2020 23:45:55 +0100 Message-Id: <20201104224558.3384595-7-philmd@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20201104224558.3384595-1-philmd@redhat.com> References: <20201104224558.3384595-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/03 22:09:52 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_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, 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: Peter Maydell , Thomas Huth , "Daniel P . Berrange" , John Snow , Cornelia Huck , Wainer dos Santos Moschetta , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , =?utf-8?q?Alex_Benn=C3=A9e?= 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é --- .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 Wed Nov 4 22:45:56 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: 318562 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.5 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, URIBL_BLOCKED, 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 9AC87C388F7 for ; Wed, 4 Nov 2020 22:52:10 +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 08A6320825 for ; Wed, 4 Nov 2020 22:52:09 +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="L3miVVeA" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 08A6320825 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]:60516 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kaRdP-00040W-QR for qemu-devel@archiver.kernel.org; Wed, 04 Nov 2020 17:52:07 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:41276) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kaRYP-0005eJ-Ds for qemu-devel@nongnu.org; Wed, 04 Nov 2020 17:46:57 -0500 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:33909) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kaRYM-0006yc-4a for qemu-devel@nongnu.org; Wed, 04 Nov 2020 17:46:57 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1604530013; 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=11lY/RGidWh4E+Dz/TixgXDK1Sn2olK+Ru2uFDMNMxs=; b=L3miVVeAwJXDhXrw/lefgah3WH2Dsi7C7M+2omlEw3CnNpVAc0vFJpijNEqXXR/3fc9h/Y A/mg+Um6I5yU3HzrzsM8h6Sm6UEcPxlUBDoJhw9RvDKDFx6HLu2VrDUT7vuKCSJDrhQ8d9 6v2GXWCa045ct9d7e9E5FbH4voq5s0w= Received: from mail-wm1-f72.google.com (mail-wm1-f72.google.com [209.85.128.72]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-202-BMJVguebNAGq03JvXsZc7Q-1; Wed, 04 Nov 2020 17:46:39 -0500 X-MC-Unique: BMJVguebNAGq03JvXsZc7Q-1 Received: by mail-wm1-f72.google.com with SMTP id a130so1692954wmf.0 for ; Wed, 04 Nov 2020 14:46:39 -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=11lY/RGidWh4E+Dz/TixgXDK1Sn2olK+Ru2uFDMNMxs=; b=hICd3r1sjKkGN22kWfzFIcGdgTHaMbQlbsY8JUaApMVPm0x4z71T+JKMbhnda0MRjy 6pvxQRiW3a9NlD9h1HjYJbESXHAA9qQ4WJJWyttK53hjDrmXA7ecneiLaKchwmTdVg01 44ekIjkKM6UB41lPHVO7Pzbg9O7v0RkNJrXEpLNPohG+eAi+d/c8EcJoR8p6/C0NDhIy i1Yl1nLpBkzBjK7/jtO7IDY7bgq3tlMdVBRsZaXcXMSNHXLGBBog5jFAtF0WSAsnGGXZ c3pjbMw7rm6xX8jaMPu2Ima5YSMf9HK1wTSaA5MeYav/Agt8nICe8l3DEjLt75BZpOmZ AAGg== X-Gm-Message-State: AOAM532xm0hY66y99UIewRKZGk5yrw4CxIMue3hzkid9MYA9Tnp/ecAP mOI8Wehx3uW7zOQkg4IqVFpU8PrUDzaPBuiLdKBD17R5FeOi1q/vd+/oAYfZcIH5yjTyEAmFHSt OguRa2JaJ0ZxGYXk= X-Received: by 2002:a7b:c2ef:: with SMTP id e15mr7338024wmk.180.1604529998250; Wed, 04 Nov 2020 14:46:38 -0800 (PST) X-Google-Smtp-Source: ABdhPJyODpSqnyI9EbB/njgYOa87vdZh8HgEhdBt8QSAE952wM4G23Scni4+0ZdTCbOIdN0T6yHFQQ== X-Received: by 2002:a7b:c2ef:: with SMTP id e15mr7338008wmk.180.1604529998046; Wed, 04 Nov 2020 14:46:38 -0800 (PST) Received: from x1w.redhat.com (234.red-83-42-66.dynamicip.rima-tde.net. [83.42.66.234]) by smtp.gmail.com with ESMTPSA id t23sm4096810wmn.13.2020.11.04.14.46.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 04 Nov 2020 14:46:37 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [RFC PATCH 7/9] gitlab-ci: Extract common job definition as 'native_common_job' Date: Wed, 4 Nov 2020 23:45:56 +0100 Message-Id: <20201104224558.3384595-8-philmd@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20201104224558.3384595-1-philmd@redhat.com> References: <20201104224558.3384595-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/03 22:09:52 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_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, 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: Peter Maydell , Thomas Huth , "Daniel P . Berrange" , John Snow , Cornelia Huck , Wainer dos Santos Moschetta , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , =?utf-8?q?Alex_Benn=C3=A9e?= Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Extract the common definitions shared by '.native_build_job' and '.native_test_job' to '.native_common_job'. Signed-off-by: Philippe Mathieu-Daudé --- .gitlab-ci.yml | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 0b77a90dd73..961070d2cbe 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -19,9 +19,12 @@ include: - local: '/.gitlab-ci.d/containers.yml' - local: '/.gitlab-ci.d/crossbuilds.yml' -.native_build_job: - stage: build +.native_common_job: image: $CI_REGISTRY_IMAGE/qemu/$IMAGE:latest + +.native_build_job: + extends: .native_common_job + stage: build before_script: - JOBS=$(expr $(nproc) + 1) - sed -i s,git.qemu.org/git,gitlab.com/qemu-project, .gitmodules @@ -41,8 +44,8 @@ include: fi .native_test_job: + extends: .native_common_job stage: test - image: $CI_REGISTRY_IMAGE/qemu/$IMAGE:latest script: - cd build - find . -type f -exec touch {} + From patchwork Wed Nov 4 22:45:57 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: 318563 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.5 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, URIBL_BLOCKED, 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 1BAB7C2D0A3 for ; Wed, 4 Nov 2020 22:51:52 +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 72A1C2080D for ; Wed, 4 Nov 2020 22:51:51 +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="HW8N8XZZ" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 72A1C2080D 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]:59848 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kaRd8-0003kM-GE for qemu-devel@archiver.kernel.org; Wed, 04 Nov 2020 17:51:50 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:41222) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kaRYI-0005Xh-LM for qemu-devel@nongnu.org; Wed, 04 Nov 2020 17:46:50 -0500 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:55224) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kaRYG-0006xy-B4 for qemu-devel@nongnu.org; Wed, 04 Nov 2020 17:46:50 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1604530006; 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=MWl5vDwzLcy8Zov/XDOnc/IDx3/z+3tMGxYwpmBuCno=; b=HW8N8XZZzc5xrad93sRIgnpHpPlbl/h67XsMjbNau0yugE56HTFwhEFr9JY37uLcRv+mcP tUfIGpBtPhueCPv4jFpN9DcijtUavD4/j1vK/ymMJKsS6wPyFPn9Bv0wAgjS95QXcsOuqx oS2jEF/SKyUXZfqM4LQ2xt99hHRqMRM= Received: from mail-wm1-f72.google.com (mail-wm1-f72.google.com [209.85.128.72]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-432-i1htJr5_P2GWFvI3Nw5Oog-1; Wed, 04 Nov 2020 17:46:45 -0500 X-MC-Unique: i1htJr5_P2GWFvI3Nw5Oog-1 Received: by mail-wm1-f72.google.com with SMTP id c10so1808787wmh.6 for ; Wed, 04 Nov 2020 14:46:44 -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=MWl5vDwzLcy8Zov/XDOnc/IDx3/z+3tMGxYwpmBuCno=; b=aKYQDs/SYV3bPQw4ICuVp6ZrQMg9agHPe5GoL8ouWaJ8R7yn8rVFcu17NraunHzVNO UpV9WYt9tWfw9fPUiC3P84gIILtD4z6sVc22/Naw1fkfYO1tdwDNZ5LQ4xzQiR2sAOzJ 5xZq5fjkJ/aMGyKjluvxWj8oFA4QJlrd1GvwJZP0vdqzPKAyaS0TZi0Oh9RDTjHyS2es Q6RED+oW+KNcUprx8Sn4B0B6sBMlL+o9QixxgvPm9Gv1VgM2g3M5lX4ZsbojkpsE8XoS udrd1/LLvdi8s6td+aBKFklXafUazEkl7NxOYdRCwOlWU/cXIWUnZfp52HnpUkLhvlc8 bgyQ== X-Gm-Message-State: AOAM533REsKk4pcK6DmpI0BhW3RUaWIpnBfdtRTktq/s+R7Vkcq0uf6A 0pNQl4ev+5x/PeViBIQpcppr/8M/fkj0YG4ELdHDNm67hOzGhLLaOo8NMyQbueqwdYNHxIQTYGR 9ntwam/NLF2m4Q0I= X-Received: by 2002:a1c:9a8d:: with SMTP id c135mr6725664wme.173.1604530003491; Wed, 04 Nov 2020 14:46:43 -0800 (PST) X-Google-Smtp-Source: ABdhPJwSOQxvQSTa+LBitUJ5i0cYXK8vrDRaB3lyc2khopQC1QgTTAL5JMfPmSD3NhpMZ0zKLDYMwg== X-Received: by 2002:a1c:9a8d:: with SMTP id c135mr6725648wme.173.1604530003334; Wed, 04 Nov 2020 14:46:43 -0800 (PST) Received: from x1w.redhat.com (234.red-83-42-66.dynamicip.rima-tde.net. [83.42.66.234]) by smtp.gmail.com with ESMTPSA id e6sm4663274wrs.7.2020.11.04.14.46.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 04 Nov 2020 14:46:42 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [RFC PATCH 8/9] gitlab-ci: Add rules to skip building cross-jobs Date: Wed, 4 Nov 2020 23:45:57 +0100 Message-Id: <20201104224558.3384595-9-philmd@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20201104224558.3384595-1-philmd@redhat.com> References: <20201104224558.3384595-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/03 22:09:52 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_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, 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: Peter Maydell , Thomas Huth , "Daniel P . Berrange" , John Snow , Cornelia Huck , Wainer dos Santos Moschetta , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , =?utf-8?q?Alex_Benn=C3=A9e?= Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Add rules to skip some crossbuild jobs. The following tags are available to skip CI jobs: - cross (skip all cross-jobs) - system (skip all cross-system jobs) - user (skip all cross-user jobs) Developers can combine tags in the SKIP_BUILD variable when pushing a branch (or tag) to repositories. Examples: $ git push -o ci.variable="SKIP_BUILD=user" myrepo mybranch $ git push -o ci.variable="SKIP_BUILD=user,system" 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.d/crossbuilds.yml | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/.gitlab-ci.d/crossbuilds.yml b/.gitlab-ci.d/crossbuilds.yml index 701550f028c..08f27649eb2 100644 --- a/.gitlab-ci.d/crossbuilds.yml +++ b/.gitlab-ci.d/crossbuilds.yml @@ -1,6 +1,16 @@ .cross_common_job: stage: build image: $CI_REGISTRY_IMAGE/qemu/$IMAGE:latest + rules: + # If the if statement is true, the job is excluded from a pipeline. + - if: $SKIP_BUILD =~ /cross/ + when: never + - if: $CI_JOB_NAME =~ /system/ && $SKIP_BUILD =~ /system/ + when: never + - if: $CI_JOB_NAME =~ /user/ && $SKIP_BUILD =~ /user/ + when: never + # In all other cases, the job is added to the pipeline. + - when: on_success .cross_system_build_job: extends: .cross_common_job