From nobody Mon Nov 17 15:59:37 2025 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=1604529986; cv=none; d=zohomail.com; s=zohoarc; b=P5slX5lylzcNmyS9ZqDhFzjz6uTeAXeENzXZYgB7HEjIBey88MvpCrdQlWvnYOq48o/d9Arq2NOu12yNFJ3iHOGLbl7BqMc3KWjYMo49iL7zoRGiyhCYHaIBWRvgYO21MyJQmjUNLCbgleIiEd987PgMWrm5B/GlCMaZKiDJihY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1604529986; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=ZKfst5p/Yonp+OSkXV2uundvG0uzrAH2pf1hHzEsgM4=; b=gQarN9AlG9VO2ui0srLgrylOww02YO+S5ugWnApX4w3z0MFwkuTmO2EMqnDib9YqNXCVAnY/iig3EPsuWBL5/bCrULL6MFxI4uj7XRbCXRAioNA78xtNr7Di9wbR06G27ANkOxeEyu0RNGYiv1IGoRVoPeR+hOKWF0Vpbsw6kY8= 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 1604529986329406.10952239421624; Wed, 4 Nov 2020 14:46:26 -0800 (PST) Received: from mail-wm1-f69.google.com (mail-wm1-f69.google.com [209.85.128.69]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-18-70LbTr4ROu2MGXIU933WFA-1; Wed, 04 Nov 2020 17:46:23 -0500 Received: by mail-wm1-f69.google.com with SMTP id y26so1084098wmj.7 for ; Wed, 04 Nov 2020 14:46:23 -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 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) 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= X-MC-Unique: 70LbTr4ROu2MGXIU933WFA-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=ZKfst5p/Yonp+OSkXV2uundvG0uzrAH2pf1hHzEsgM4=; b=LsjnLUInvmXoDlsw5cx2ieHqu4K6HN/a/rx9/YElUvvbO4qmem4RLLiBQF23ooNvQX caIRITyPvsNLfVuOMPKwuHczawe7336DXwkcwfwZDxSRUCoKeJDPSxpHD8KTqok+HX8q NkPPNNtCLhm2X+Dng/dXnCravUsbjjxmKPqdwMIkcDkrA8mFsnSj7bMmpGl5aTtg8DtB +s5sB4B9STHCOhOGP9AtA5b0guty4RGHTcz8CwYvpFOohj34jNIDujuKoW7RJSfcV2oK 6IhWy9DsLIFL3TqVHn77LjkgLFRGf9Mj9vEDAauD/z8yYPF9QOb9iYQ5GONSs4qgFv4Q bNMw== X-Gm-Message-State: AOAM530G9ox2crPNGEvxqxtbkoyx3kjpX6Px8IV7gzxu4r79wpWMRZ0y DEEa3sMfGMUV8+v/Dnn/BAh7zeoDHria2LdOW6EzMrPT8D9qGWUVD2G+dDGNSK2GBkyYjnattJd UFccKIw/BdmGivQ== X-Received: by 2002:adf:9d44:: with SMTP id o4mr237734wre.229.1604529982197; 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) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: "Daniel P . Berrange" , John Snow , Cornelia Huck , =?UTF-8?q?Alex=20Benn=C3=A9e?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Wainer dos Santos Moschetta , Thomas Huth , Peter Maydell 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 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 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 =20 -.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 =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 @@ -126,14 +126,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 @@ -158,14 +157,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 @@ -190,14 +188,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