From nobody Mon Feb 9 08:11:59 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) client-ip=63.128.21.124; envelope-from=philmd@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1605024129; cv=none; d=zohomail.com; s=zohoarc; b=dlPDBu3K+uPXXIXttmBmixgKMqjOgrx+0iY/Nqn61vZB4hmC4DdCIyx5ZuiSqAVM7/NBlIoRf7/ZJoNObM0ufuh4nQrKWxEJdz9vlFBJmwF3vQ7NsN26ixfPU1drE4tTqsNxtNidc3QFUCvx1p9/zpKHZwaXngDc6cUUu/U4UpQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1605024129; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=NaqlQxNvH3AUGOJqrVZYZoAO4Lf395wo2rX6dkLCW10=; b=ZY+3pRAhBYJJu6FwWhtE9O8/EAm3FTJ6OD+Uylc/oD6X0OrmrNKBNmn2mB9uYBVN5feC/gVRQXW7bIkHBqWZ1LHQj5tN+FebQOlTxkk1BceZURg6XFcUccnn/h9+It1Gi6at5eqF4UInd88XFxE5KHd6te3YYYzCiGNrZ0Ubuk4= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [63.128.21.124]) by mx.zohomail.com with SMTPS id 1605024129648411.9269562148386; Tue, 10 Nov 2020 08:02:09 -0800 (PST) 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-354-4xByKxRnPYGKeDH2qhMVsA-1; Tue, 10 Nov 2020 11:02:05 -0500 Received: by mail-wm1-f70.google.com with SMTP id y1so1452938wma.5 for ; Tue, 10 Nov 2020 08:02:04 -0800 (PST) Return-Path: Return-Path: 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 h62sm17904011wrh.82.2020.11.10.08.02.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 Nov 2020 08:02:03 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1605024126; 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=NaqlQxNvH3AUGOJqrVZYZoAO4Lf395wo2rX6dkLCW10=; b=EcgYuJHaLo/YekuRndI7hsxed991McEq61yQeBO6ET8p6IKHNDv8P6g/2AWLHlY5YYSAhw SjIPPcqwOvmZf8dkkC0sODqF4oE/EBdxBnNTsRbJ4SmSDZg7uSVq9iq1kEX1laYv1RYYpJ jd7mS8bkWX9H6+FRKhxM6UoLhAyWEcg= X-MC-Unique: 4xByKxRnPYGKeDH2qhMVsA-1 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=NaqlQxNvH3AUGOJqrVZYZoAO4Lf395wo2rX6dkLCW10=; b=Wgkzg8Haz1NdbJrBb8WEpIAAOPp3KnHHrSmzigP8MUkpGHJWD4gIp7bEVKSeYNqRyY ohct0B6YjLRufkZ96iTmZjzE9m8+FZf5I6rob37/qxVmHTPKvAueqdtkyPZ16wGy+7Lm qctqVqsxI3S3HbeO9K1PDh+l51NValw0sxWOabDYmggUQoqOcAMSy+volHkalHnC9hDs WESF4d938wmbH/z3BaPy28/2HG7yS9kCqFAh+5oH96mBkzrh2a3zDFdI96MBGhBEvSDK 88/Sx3vBGsQVoTWAwRNOAfmGCVZvWMCjKhK7I9U9zvTqtXdrFTn/twEAKZd7UfORtayA cqnw== X-Gm-Message-State: AOAM532G9pBMNWGDEkM22QTIWHa6hjqV4xWxHVc55lL4t6vzuVREnF/1 AqjDAAqaC5+4BS2x5hOEeETr7/JzQ5rucwM0RyKf3IkTl5qQXDbXpe/bc1DBAbNl5Cq0bVplvm+ Q/7R+kiyh6kpLIQ== X-Received: by 2002:a05:600c:2282:: with SMTP id 2mr420655wmf.154.1605024123928; Tue, 10 Nov 2020 08:02:03 -0800 (PST) X-Google-Smtp-Source: ABdhPJz/pq95zFh1obtopXKRHlurt+wMS4j+Ja+Zf3k3XTtxbpFD4DD+mTivmR3G+LcuDeRa7FSzdA== X-Received: by 2002:a05:600c:2282:: with SMTP id 2mr420633wmf.154.1605024123693; Tue, 10 Nov 2020 08:02:03 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Laszlo Ersek , "Daniel P . Berrange" , Stefan Weil , Wainer dos Santos Moschetta , Fam Zheng , virt-ci-maint-team@redhat.com, Michael Tokarev , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Bin Meng , Bin Meng , Thomas Huth , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [RFC PATCH 04/16] gitlab-ci: Replace YAML anchors by extends (acceptance_test_job) Date: Tue, 10 Nov 2020 17:01:28 +0100 Message-Id: <20201110160140.2859904-5-philmd@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20201110160140.2859904-1-philmd@redhat.com> References: <20201110160140.2859904-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 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) '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=C3=A9 --- .gitlab-ci.yml | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index c8fdaecaf51..a45444f884b 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -42,7 +42,8 @@ include: - find . -type f -exec touch {} + - make $MAKE_CHECK_ARGS =20 -.acceptance_template: &acceptance_definition +.acceptance_test_job: + extends: .native_test_job cache: key: "${CI_JOB_NAME}-cache" paths: @@ -90,14 +91,13 @@ check-system-ubuntu: MAKE_CHECK_ARGS: check =20 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 =20 build-system-debian: extends: .native_build_job @@ -122,14 +122,13 @@ check-system-debian: MAKE_CHECK_ARGS: check =20 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 =20 build-system-fedora: extends: .native_build_job @@ -154,14 +153,13 @@ check-system-fedora: MAKE_CHECK_ARGS: check =20 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 =20 build-system-centos: extends: .native_build_job @@ -186,14 +184,13 @@ check-system-centos: MAKE_CHECK_ARGS: check =20 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 =20 build-disabled: extends: .native_build_job --=20 2.26.2