From patchwork Wed Nov 4 22:45:50 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: 1394546 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=gPo4SPUF; dkim-atps=neutral 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 ozlabs.org (Postfix) with ESMTPS id 4CRMJy3G4yz9sTK for ; Thu, 5 Nov 2020 09:49:06 +1100 (AEDT) Received: from localhost ([::1]:50260 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kaRaS-0008Cz-CZ for incoming@patchwork.ozlabs.org; Wed, 04 Nov 2020 17:49:04 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:41030) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kaRXj-0004xy-Lu for qemu-devel@nongnu.org; Wed, 04 Nov 2020 17:46:15 -0500 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:29659) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kaRXh-0006uK-Ln for qemu-devel@nongnu.org; Wed, 04 Nov 2020 17:46:15 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1604529969; 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=HkmWM8pdBxBAkh2ux+VVNAnnOD7tHToqsp9wNXfrvV8=; b=gPo4SPUFg/GZJmhAVVzA2pLfEuzN/OZ9KxszorhN/APH4JJsxM63FU9X5/wZX5dbbAffVM qaVsZnXIDGRp7fWPrQ4XQG+hJppGtmAy1Qs9+MhLpwl59iZL5PrYUiHgFCA/rFm/AJ/igm ct2GPBn4nv4UEDmdln/6jAtDt4my/xU= 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-282-7m5Xq-5KMcCePajbv77RJg-1; Wed, 04 Nov 2020 17:46:07 -0500 X-MC-Unique: 7m5Xq-5KMcCePajbv77RJg-1 Received: by mail-wr1-f71.google.com with SMTP id h11so4228wrq.20 for ; Wed, 04 Nov 2020 14:46:07 -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=HkmWM8pdBxBAkh2ux+VVNAnnOD7tHToqsp9wNXfrvV8=; b=nUrSr6O0Z0caYChq/4EAnLv9ODyJ0zz8LC5XtgefwjGq8eejpSE6S5u7zCIuTfCEVM prUKNys7Vn677GeKVacsAXY/cwfimBFbIMMtKaVRKpZIE+mwmWwalZ9LiNgJ7bfP/t5R nT8aweaQjpLZjrHcPSg3GB7KTNN1nev8+EyHlvWaPaK3IFcbLLHA25j8FCIZE51mQ4kU w8CO0cVN71TXCV0gjWPoHTk+o5c87tnaJZNvKzAFgmLE0FBd7D3L6p3OcsoQWWReJfZH 1AFgFX4E/2uxKTK0Nf4+8QneVTgeNkNqhoX7ubtvPEVF7/DOiYDIpLhcgwGSDm5rLdbn iGTQ== X-Gm-Message-State: AOAM5309iruzG4owmdirRhbYdijBcJf3fJusIIquevLY7EFS+9G8KlAr gYflp1h0PpRO75BfYQpjLu6hIv3787wsUhIsSi7VhpddqoI7/Y/t5LqM9zc5qFhyyNpZ1rSW0tc T5Ltje+BVopdyA1Q= X-Received: by 2002:a05:600c:4147:: with SMTP id h7mr6864311wmm.186.1604529966054; Wed, 04 Nov 2020 14:46:06 -0800 (PST) X-Google-Smtp-Source: ABdhPJy9CzAY/sUwvhSvOe/xNEi44Xc5Kj5A8DVnSOaxnZpa4iKK/TTktmtoGsI/BfPzECzsQrnNYA== X-Received: by 2002:a05:600c:4147:: with SMTP id h7mr6864290wmm.186.1604529965826; Wed, 04 Nov 2020 14:46:05 -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 u3sm4784514wrq.19.2020.11.04.14.46.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 04 Nov 2020 14:46:05 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [RFC PATCH 1/9] gitlab-ci: Replace YAML anchors by extends (cross_system_build_job) Date: Wed, 4 Nov 2020 23:45:50 +0100 Message-Id: <20201104224558.3384595-2-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_Mathi?= =?utf-8?q?eu-Daud=C3=A9?= , =?utf-8?q?Alex_Benn=C3=A9e?= Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.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.d/crossbuilds.yml | 40 ++++++++++++++++++------------------ 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/.gitlab-ci.d/crossbuilds.yml b/.gitlab-ci.d/crossbuilds.yml index 03ebfabb3fa..099949aaef3 100644 --- a/.gitlab-ci.d/crossbuilds.yml +++ b/.gitlab-ci.d/crossbuilds.yml @@ -1,5 +1,5 @@ -.cross_system_build_job_template: &cross_system_build_job_definition +.cross_system_build_job: stage: build image: $CI_REGISTRY_IMAGE/qemu/$IMAGE:latest timeout: 80m @@ -13,7 +13,7 @@ xtensa-softmmu" - make -j$(expr $(nproc) + 1) all check-build -.cross_user_build_job_template: &cross_user_build_job_definition +.cross_user_build_job: stage: build image: $CI_REGISTRY_IMAGE/qemu/$IMAGE:latest script: @@ -24,91 +24,91 @@ - make -j$(expr $(nproc) + 1) all check-build cross-armel-system: - <<: *cross_system_build_job_definition + extends: .cross_system_build_job variables: IMAGE: debian-armel-cross cross-armel-user: - <<: *cross_user_build_job_definition + extends: .cross_user_build_job variables: IMAGE: debian-armel-cross cross-armhf-system: - <<: *cross_system_build_job_definition + extends: .cross_system_build_job variables: IMAGE: debian-armhf-cross cross-armhf-user: - <<: *cross_user_build_job_definition + extends: .cross_user_build_job variables: IMAGE: debian-armhf-cross cross-arm64-system: - <<: *cross_system_build_job_definition + extends: .cross_system_build_job variables: IMAGE: debian-arm64-cross cross-arm64-user: - <<: *cross_user_build_job_definition + extends: .cross_user_build_job variables: IMAGE: debian-arm64-cross cross-mips-system: - <<: *cross_system_build_job_definition + extends: .cross_system_build_job variables: IMAGE: debian-mips-cross cross-mips-user: - <<: *cross_user_build_job_definition + extends: .cross_user_build_job variables: IMAGE: debian-mips-cross cross-mipsel-system: - <<: *cross_system_build_job_definition + extends: .cross_system_build_job variables: IMAGE: debian-mipsel-cross cross-mipsel-user: - <<: *cross_user_build_job_definition + extends: .cross_user_build_job variables: IMAGE: debian-mipsel-cross cross-mips64el-system: - <<: *cross_system_build_job_definition + extends: .cross_system_build_job variables: IMAGE: debian-mips64el-cross cross-mips64el-user: - <<: *cross_user_build_job_definition + extends: .cross_user_build_job variables: IMAGE: debian-mips64el-cross cross-ppc64el-system: - <<: *cross_system_build_job_definition + extends: .cross_system_build_job variables: IMAGE: debian-ppc64el-cross cross-ppc64el-user: - <<: *cross_user_build_job_definition + extends: .cross_user_build_job variables: IMAGE: debian-ppc64el-cross cross-s390x-system: - <<: *cross_system_build_job_definition + extends: .cross_system_build_job variables: IMAGE: debian-s390x-cross cross-s390x-user: - <<: *cross_user_build_job_definition + extends: .cross_user_build_job variables: IMAGE: debian-s390x-cross cross-win32-system: - <<: *cross_system_build_job_definition + extends: .cross_system_build_job variables: IMAGE: fedora-win32-cross cross-win64-system: - <<: *cross_system_build_job_definition + extends: .cross_system_build_job variables: IMAGE: fedora-win64-cross 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: 1394543 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=BC7cpdqv; dkim-atps=neutral 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 ozlabs.org (Postfix) with ESMTPS id 4CRMGl4N3Sz9sTK for ; Thu, 5 Nov 2020 09:47:11 +1100 (AEDT) Received: from localhost ([::1]:42452 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kaRYb-000518-AR for incoming@patchwork.ozlabs.org; Wed, 04 Nov 2020 17:47:09 -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_Mathi?= =?utf-8?q?eu-Daud=C3=A9?= , =?utf-8?q?Alex_Benn=C3=A9e?= Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.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:52 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: 1394545 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=dlRn8gM6; dkim-atps=neutral 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 ozlabs.org (Postfix) with ESMTPS id 4CRMGt25wKz9sTK for ; Thu, 5 Nov 2020 09:47:18 +1100 (AEDT) Received: from localhost ([::1]:42600 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kaRYi-000559-9N for incoming@patchwork.ozlabs.org; Wed, 04 Nov 2020 17:47:16 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:41096) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kaRXx-00053R-HP for qemu-devel@nongnu.org; Wed, 04 Nov 2020 17:46:30 -0500 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:22853) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kaRXp-0006vU-RB for qemu-devel@nongnu.org; Wed, 04 Nov 2020 17:46:28 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1604529979; 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=PCN6dfpZymVLf09y3AxbAjVnHuY6KWlk5zsogr0z+5M=; b=dlRn8gM6eJ2IAo/jHuZplyPA60of2suW40k03LyVY5kWxCNlg8qJRFfw1A7VxhAnUFSrIY yDorFNagdewhmQd2nlSwQTqpkieeD1AMkE7yzWOwnU4wWNVyrfrpm2Umd0di6rWOUDF7Zf n1YYK5FEe/Jg6MLsvBItCQgkg6+4x9M= Received: from mail-wm1-f70.google.com (mail-wm1-f70.google.com [209.85.128.70]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-596-6eZ1a5yvNAa0HmNrC8xEJQ-1; Wed, 04 Nov 2020 17:46:18 -0500 X-MC-Unique: 6eZ1a5yvNAa0HmNrC8xEJQ-1 Received: by mail-wm1-f70.google.com with SMTP id u207so1809178wmu.4 for ; Wed, 04 Nov 2020 14:46: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=PCN6dfpZymVLf09y3AxbAjVnHuY6KWlk5zsogr0z+5M=; b=fRtYfyn7vaCxZs1sLF2OqTzYPhGXBBllWu5RG37NraVD7BXc93NkWkQ+SmoB4nK2IL mdqzoRW0LJSbnVCFsGjihiEFx1+xFyl1ew4TvAv06H983WKuCD+AsTG9O+tkln/op5Us 7DilZFgO7jqKVcrXOvzESkc1cqEzUjFmL+KJoeJWW8FFE+dbDznmtj/OVn4kfgGXs5Jm d2HPZ6OZ0xgr9QjZpEqIztjdOmJznb39b4q3gonhSqZ6DqzKFHuv1JKpJUVvUJPfXOfH 1rTQ9oRaPidf8YTva5zkl+fdfvSSABZGFmWhJIvEDxgcsQw9MWCrxiwwWODRBn+HPSAV hiDw== X-Gm-Message-State: AOAM531bmWSG+D/tQCBy6r8/M+PoGp0OZk8SbmBTZcph3VppJI9XyEjS GGhFQzZM0ij4MVwOQYGFnSlQvPEd7u16WgviyjBxe2Uyjj9Se1wEOTrw17PBWFsVLNKCQidVmHb L3qQO23ArqiFYqcs= X-Received: by 2002:adf:e5c4:: with SMTP id a4mr290250wrn.56.1604529976679; Wed, 04 Nov 2020 14:46:16 -0800 (PST) X-Google-Smtp-Source: ABdhPJzQDxcp6PICXbfuovv6Dl9od1DCN1BfOTrENibDvKE0fFbxw1qSS8+S67r0rDJpGKalyPZ4dA== X-Received: by 2002:adf:e5c4:: with SMTP id a4mr290238wrn.56.1604529976532; Wed, 04 Nov 2020 14:46:16 -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 h7sm5214396wrt.45.2020.11.04.14.46.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 04 Nov 2020 14:46:15 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [RFC PATCH 3/9] gitlab-ci: Replace YAML anchors by extends (native_test_job) Date: Wed, 4 Nov 2020 23:45:52 +0100 Message-Id: <20201104224558.3384595-4-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_Mathi?= =?utf-8?q?eu-Daud=C3=A9?= , =?utf-8?q?Alex_Benn=C3=A9e?= Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.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 | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ff3a8bd58cf..83beefa2c85 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -40,7 +40,7 @@ include: make -j"$JOBS" $MAKE_CHECK_ARGS ; fi -.native_test_job_template: &native_test_job_definition +.native_test_job: stage: test image: $CI_REGISTRY_IMAGE/qemu/$IMAGE:latest script: @@ -86,7 +86,7 @@ build-system-ubuntu: - build check-system-ubuntu: - <<: *native_test_job_definition + extends: .native_test_job needs: - job: build-system-ubuntu artifacts: true @@ -95,7 +95,7 @@ check-system-ubuntu: MAKE_CHECK_ARGS: check acceptance-system-ubuntu: - <<: *native_test_job_definition + extends: .native_test_job needs: - job: build-system-ubuntu artifacts: true @@ -117,7 +117,7 @@ build-system-debian: - build check-system-debian: - <<: *native_test_job_definition + extends: .native_test_job needs: - job: build-system-debian artifacts: true @@ -126,7 +126,7 @@ check-system-debian: MAKE_CHECK_ARGS: check acceptance-system-debian: - <<: *native_test_job_definition + extends: .native_test_job needs: - job: build-system-debian artifacts: true @@ -149,7 +149,7 @@ build-system-fedora: - build check-system-fedora: - <<: *native_test_job_definition + extends: .native_test_job needs: - job: build-system-fedora artifacts: true @@ -158,7 +158,7 @@ check-system-fedora: MAKE_CHECK_ARGS: check acceptance-system-fedora: - <<: *native_test_job_definition + extends: .native_test_job needs: - job: build-system-fedora artifacts: true @@ -181,7 +181,7 @@ build-system-centos: - build check-system-centos: - <<: *native_test_job_definition + extends: .native_test_job needs: - job: build-system-centos artifacts: true @@ -190,7 +190,7 @@ check-system-centos: MAKE_CHECK_ARGS: check acceptance-system-centos: - <<: *native_test_job_definition + extends: .native_test_job needs: - job: build-system-centos artifacts: true @@ -288,7 +288,7 @@ build-deprecated: # We split the check-tcg step as test failures are expected but we still # want to catch the build breaking. check-deprecated: - <<: *native_test_job_definition + extends: .native_test_job needs: - job: build-deprecated artifacts: true @@ -352,7 +352,7 @@ build-crypto-old-nettle: - build check-crypto-old-nettle: - <<: *native_test_job_definition + extends: .native_test_job needs: - job: build-crypto-old-nettle artifacts: true @@ -373,7 +373,7 @@ build-crypto-old-gcrypt: - build check-crypto-old-gcrypt: - <<: *native_test_job_definition + extends: .native_test_job needs: - job: build-crypto-old-gcrypt artifacts: true @@ -394,7 +394,7 @@ build-crypto-only-gnutls: - build check-crypto-only-gnutls: - <<: *native_test_job_definition + extends: .native_test_job needs: - job: build-crypto-only-gnutls artifacts: true 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: 1394544 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=hfnORgKA; dkim-atps=neutral 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 ozlabs.org (Postfix) with ESMTPS id 4CRMGt4SvQz9sVD for ; Thu, 5 Nov 2020 09:47:18 +1100 (AEDT) Received: from localhost ([::1]:42726 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kaRYi-00058W-JV for incoming@patchwork.ozlabs.org; Wed, 04 Nov 2020 17:47:16 -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_Mathi?= =?utf-8?q?eu-Daud=C3=A9?= , =?utf-8?q?Alex_Benn=C3=A9e?= Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.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:54 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: 1394548 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=KJSJpaN+; dkim-atps=neutral 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 ozlabs.org (Postfix) with ESMTPS id 4CRMKd3Hr9z9sTK for ; Thu, 5 Nov 2020 09:49:41 +1100 (AEDT) Received: from localhost ([::1]:51116 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kaRb0-00006I-Jr for incoming@patchwork.ozlabs.org; Wed, 04 Nov 2020 17:49:39 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:41170) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kaRY4-00058m-J6 for qemu-devel@nongnu.org; Wed, 04 Nov 2020 17:46:36 -0500 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:52328) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kaRY2-0006wU-TP for qemu-devel@nongnu.org; Wed, 04 Nov 2020 17:46:36 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1604529990; 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=m7pizr2OhXI85zkuQe5QkflRj9AoLh16xj+zmAhsSGc=; b=KJSJpaN+IqMH6+P3qK8wyFo7jfHKc2a4Saq08zDxEiAsHRpqAGe6RwfiDDHvqhv8BATBPx pSxsuCSWHFYGoqa+8jvSRvEtPDSkPP33WKwyvbUivExtM6qIF3N9WG1OXSfGtKHhHpaUKw h08/IVv975iqcjDUuWXyC4ryMtXSDw4= 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-295-YVN5ibCGOyqDZT5xi3NKSw-1; Wed, 04 Nov 2020 17:46:29 -0500 X-MC-Unique: YVN5ibCGOyqDZT5xi3NKSw-1 Received: by mail-wm1-f71.google.com with SMTP id e15so1089761wme.4 for ; Wed, 04 Nov 2020 14:46:28 -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=m7pizr2OhXI85zkuQe5QkflRj9AoLh16xj+zmAhsSGc=; b=fSRZzw6cBehKBy9ojODKFgf3aS5KKwGyrTWENtLGEmEev1b9dx6zs397C6371At7qE Sd8Z7aDicXzckaXB1TlNQiWnVSDts8J/X5jx9bwyEwS7mtvY77cwEJ0hQ5FTn06Uz+2Q 8fUYqFfEvVBnmAA7MV39AigHs/I6hnqi5Ph6ievnexgEamWDXXVcPntrlO8Wp37/Q1/P Pt6Bma8r7KMr65tWGobKAiGKqJpLJ0iEis+3pFEt9J7i7Ek7hiDoPxHKS4oKIxaAAjow bKaIzTy6fP9V/GGQpzWly2KZc9nhWzSJ50uk7StgiJeVf+WsePWGYIKJo2FZLnJ/BEx2 skSw== X-Gm-Message-State: AOAM533YHyo16URc+G7hfIpj8OgAAbCM4dPR90yH31f9q31NW+ThTGcW +hYJupwObKuwDioMmuNmVKBq/eGhjfQzjVrFFOHlsgRhHM0Qt7RpzD+3KQ0mzmssShPv7krCWAr fR9IKTgrLzbJ8g8w= X-Received: by 2002:a1c:9c51:: with SMTP id f78mr7329942wme.189.1604529987520; Wed, 04 Nov 2020 14:46:27 -0800 (PST) X-Google-Smtp-Source: ABdhPJxJbxgUHHAUD3PaxivQLKXRHgwEyVxxcmXheuOiqXe/78F5oZR4xlUFLjX2wflvN0CnCzHG0Q== X-Received: by 2002:a1c:9c51:: with SMTP id f78mr7329931wme.189.1604529987325; Wed, 04 Nov 2020 14:46:27 -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 h4sm2177593wrq.3.2020.11.04.14.46.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 04 Nov 2020 14:46:26 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [RFC PATCH 5/9] gitlab-ci: Rename acceptance_test_job -> integration_test_job Date: Wed, 4 Nov 2020 23:45:54 +0100 Message-Id: <20201104224558.3384595-6-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_Mathi?= =?utf-8?q?eu-Daud=C3=A9?= , =?utf-8?q?Alex_Benn=C3=A9e?= Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Signed-off-by: Philippe Mathieu-Daudé --- .gitlab-ci.yml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 5c64e477c9d..0b77a90dd73 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -48,7 +48,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" @@ -95,8 +95,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 @@ -125,8 +125,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 @@ -156,8 +156,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 @@ -187,8 +187,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 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: 1394547 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=ilubzx2a; dkim-atps=neutral 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 ozlabs.org (Postfix) with ESMTPS id 4CRMK74LVpz9sTK for ; Thu, 5 Nov 2020 09:49:15 +1100 (AEDT) Received: from localhost ([::1]:50712 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kaRab-0008Nv-Dz for incoming@patchwork.ozlabs.org; Wed, 04 Nov 2020 17:49:13 -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_Mathi?= =?utf-8?q?eu-Daud=C3=A9?= , =?utf-8?q?Alex_Benn=C3=A9e?= Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.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: 1394551 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=L3miVVeA; dkim-atps=neutral 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 ozlabs.org (Postfix) with ESMTPS id 4CRMMP717nz9sTK for ; Thu, 5 Nov 2020 09:51:13 +1100 (AEDT) Received: from localhost ([::1]:57496 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kaRcV-0002ni-VS for incoming@patchwork.ozlabs.org; Wed, 04 Nov 2020 17:51:11 -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_Mathi?= =?utf-8?q?eu-Daud=C3=A9?= , =?utf-8?q?Alex_Benn=C3=A9e?= Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.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: 1394549 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=HW8N8XZZ; dkim-atps=neutral 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 ozlabs.org (Postfix) with ESMTPS id 4CRMMG2YH8z9sVD for ; Thu, 5 Nov 2020 09:51:06 +1100 (AEDT) Received: from localhost ([::1]:56824 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kaRcO-0002UM-At for incoming@patchwork.ozlabs.org; Wed, 04 Nov 2020 17:51:04 -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_Mathi?= =?utf-8?q?eu-Daud=C3=A9?= , =?utf-8?q?Alex_Benn=C3=A9e?= Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.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 From patchwork Wed Nov 4 22:45:58 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: 1394550 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=JDr++jZF; dkim-atps=neutral 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 ozlabs.org (Postfix) with ESMTPS id 4CRMML0M9Yz9sVD for ; Thu, 5 Nov 2020 09:51:10 +1100 (AEDT) Received: from localhost ([::1]:57148 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kaRcR-0002d9-UX for incoming@patchwork.ozlabs.org; Wed, 04 Nov 2020 17:51:07 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:41268) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kaRYO-0005c4-F5 for qemu-devel@nongnu.org; Wed, 04 Nov 2020 17:46:56 -0500 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:39360) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kaRYL-0006yN-7L for qemu-devel@nongnu.org; Wed, 04 Nov 2020 17:46:56 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1604530011; 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=FpLX9DyDtPv5J9Kb6VvonpOVnvS/v0Bt0CgJMTWK7g4=; b=JDr++jZFa1cP3goRtYxIsYQHytxw0nPWGfKScDYVEHRL4dDua2AeZqZul/JdU1TAN+O5Vm E6VSRyIOI5m6DL8Y5Ab6vE8Of5XpwyfQzkf1sLBY5MV3u3QM+Q4nYtyaGkGazmwp/id9We EUp2S3e3AsBnTYV7nU7yzl+8ewX0zzw= Received: from mail-wm1-f70.google.com (mail-wm1-f70.google.com [209.85.128.70]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-16-vfmYQH9uNe-mZnvFKxfBjg-1; Wed, 04 Nov 2020 17:46:50 -0500 X-MC-Unique: vfmYQH9uNe-mZnvFKxfBjg-1 Received: by mail-wm1-f70.google.com with SMTP id y1so476899wma.5 for ; Wed, 04 Nov 2020 14:46:50 -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=FpLX9DyDtPv5J9Kb6VvonpOVnvS/v0Bt0CgJMTWK7g4=; b=pUua/rRbCGhBs18KuyHZmaV3yAfBpfG0di43PlVFSvJ5nEv5M60f/2G22lizwYa2Xw e8FGE4idkk9P5zXTNo2NnYdRrcbut7H8qhGNp7h/oQDt+qpluESljFxY2FwX8C1JocLB m5/zGvqjoM4v6xNm0gYeq3wSqcI0K3BWbCrgnUjk5tWoX7MjFRQ2lC2r7cTjPVt2TZ0s KeF94KJGWI3a7UkeNxM8ZUSpPeGJEfKOEeMnPHfs9TmYF/C1+geDscp8d/E2R87YGP1V Qe9siXn3TCzJ8zQYF6vmezMRFLu8TU6yxncx3MlDNCab0fVVMIlgTaoVE+6kANk7aa1i BMgg== X-Gm-Message-State: AOAM531MGhbYBtBGSM9SKziMxO7k+QlWwcvYMDnqSOdkB8E4Bpwycrvb pPmq2v2/TnawgfIl1VsibyZTVmBVXEhseVqOJ8zhJB1oPVa+xz5IQwIMXcCQSOb8JzOwpEvm9sD NArTwUCyoI4O9n4E= X-Received: by 2002:adf:f74e:: with SMTP id z14mr244710wrp.312.1604530008660; Wed, 04 Nov 2020 14:46:48 -0800 (PST) X-Google-Smtp-Source: ABdhPJwWTMC/bJuH0Z5OZNDyRUvcEPOfkIl0/Y9YW1vv2gMMsssf/xwYgpj+BZKuFUdP0aCo3rpSbA== X-Received: by 2002:adf:f74e:: with SMTP id z14mr244687wrp.312.1604530008509; Wed, 04 Nov 2020 14:46:48 -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 f7sm4892993wrx.64.2020.11.04.14.46.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 04 Nov 2020 14:46:47 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [RFC PATCH 9/9] gitlab-ci: Add rules to skip building/testing native jobs Date: Wed, 4 Nov 2020 23:45:58 +0100 Message-Id: <20201104224558.3384595-10-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_Mathi?= =?utf-8?q?eu-Daud=C3=A9?= , =?utf-8?q?Alex_Benn=C3=A9e?= Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Add rules to skip various build/test jobs. The following tags are available to skip 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) 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,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 | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 961070d2cbe..432daccf590 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -21,6 +21,30 @@ include: .native_common_job: image: $CI_REGISTRY_IMAGE/qemu/$IMAGE:latest + rules: + # If the if statement is true, the job is excluded from a pipeline. + - if: ($TARGETS =~ /softmmu/ || $CONFIGURE_ARGS =~ /disable-user/) && $SKIP_BUILD =~ /system/ + when: never + - if: ($TARGETS =~ /user/ || $CONFIGURE_ARGS =~ /disable-system/) && $SKIP_BUILD =~ /user/ + when: never + - if: $IMAGE =~ /^centos/ && $SKIP_BUILD =~ /centos/ + when: never + - if: $IMAGE =~ /^debian/ && $SKIP_BUILD =~ /debian/ + when: never + - if: $IMAGE =~ /^fedora/ && $SKIP_BUILD =~ /fedora/ + when: never + - if: $IMAGE =~ /^ubuntu/ && $SKIP_BUILD =~ /ubuntu/ + when: never + - if: $CI_JOB_NAME =~ /crypto/ && $SKIP_BUILD =~ /crypto/ + when: never + - if: $CI_JOB_NAME =~ /tci/ && $SKIP_BUILD =~ /tci/ + when: never + - if: $CI_JOB_NAME =~ /fuzz/ && $SKIP_BUILD =~ /fuzz/ + when: never + - if: $CI_JOB_NAME =~ /^acceptance/ && $SKIP_BUILD =~ /integration/ + when: never + # In all other cases, the job is added to the pipeline. + - when: on_success .native_build_job: extends: .native_common_job