From nobody Tue Feb 10 11:56:35 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.49 as permitted sender) client-ip=209.85.221.49; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f49.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.49 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1620718201; cv=none; d=zohomail.com; s=zohoarc; b=Dxrz+hZptVdjBc59nLf8zxmDi//bJBkOlABoQKUku5PreXEs2HCSxY295m2vJnzPuoPHD9LDyA0MO1VLfxzbym86cIUqD3PwxnowRk8sRF24hN3D3majgOEAG+rjofkA9IwlhhqBUUt+4oImwaJFUFeLqMqTfJq661PC9xFMWNY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1620718201; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=j5Sxu4ctDafvDSNcFbyYbFbbcAFEWQpn+j7ohAb2sA4=; b=BMRcsTAQE6IRY2SoueJB4CVwnY5Bw4m73Avx5z8I26CMw7pBtSmqPAx1dwk/xSGKTB3qjDEwa83cnf+jeMLye76HeWgM0IBCzUI88PkjKEU6nrd8d5w1njLATOLXgjVw4nwXDLwJK/9I9R083HEvFoaX5PLlhqAbkdPIPKn7Qds= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.49 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wr1-f49.google.com (mail-wr1-f49.google.com [209.85.221.49]) by mx.zohomail.com with SMTPS id 1620718201085158.66083426716784; Tue, 11 May 2021 00:30:01 -0700 (PDT) Received: by mail-wr1-f49.google.com with SMTP id d11so19018140wrw.8 for ; Tue, 11 May 2021 00:30:00 -0700 (PDT) Return-Path: Return-Path: Received: from localhost.localdomain (39.red-81-40-121.staticip.rima-tde.net. [81.40.121.39]) by smtp.gmail.com with ESMTPSA id g129sm2807281wmg.27.2021.05.11.00.29.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 11 May 2021 00:29:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=j5Sxu4ctDafvDSNcFbyYbFbbcAFEWQpn+j7ohAb2sA4=; b=T5/gT1u1zbZYfqXgAxbthqe2XBSC9jqM9dyo6tulbTvdWSShXWdB/pSiMduNQDwnId 6CzQpoAfrZVSYx1hId4z8j3fMculbh00M6I6x1eQMDBAAhLJbSZ3tUB8GLWmYGg3F3WA ccl8FyO5i5nkNDXL0AQJ20sQEAaH5iSLL9fGDR8IGxBVDH6yMD3u+TGe2w3CqKbU9pk9 2FQXBNr03v2Wj0i5n4pRCv1qtmR3TJvpS1M10ETvPLFd1VlldDBGpzjjaS9BePm6J2oY 9aXdQQ14UDF8QGx9ywdgnzlEcgYkqY8GC8cNkzJx37BEvjZCVlBNLWtjDh4JQj84e7hI mV1g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=j5Sxu4ctDafvDSNcFbyYbFbbcAFEWQpn+j7ohAb2sA4=; b=SdUmWRkRxJEni9oCa6dQMcClUHwLP284KTeR6ixKtnRhmuynwKiWreoxMZH7ygfsbb QDxJY7xYCvzyjXFEdsn+Sb5LS6a4P6TC00quJeZAh6sLOQeh3IfZwbwPk9/wSwJSVl5/ vBHuqAk8WhlxW+PcXst6nuiNtRrvsJjmqSUo4b+MGLUVOYCFwenUc78CntXplyx0LJzC Ckk8n3i9rzGF1bNlo07N4SUBLO1Z1qwTWTB9KTPezIkqmEnkQQa7mKoCu6MjfR5g0BmE 3C2W5qbgPaOeelS0XO560WVqSo5KZOOdIIM9EJGdSkv7RSaHIC+YXUQVHO6oMwmlBPYN pDEA== X-Gm-Message-State: AOAM530R3VCKwX6AMSF18PNBkZwnAv5bMlLxyYaFN97U9itePIQ5tixR 0AS8BKnHQoM3NYBEyDb+sEA= X-Google-Smtp-Source: ABdhPJxnsig6bHEiUDTiKDQznPdOnRjToCkyylWOgMa+F6cMdH5eeOCTOeGhk5CE/6mXbImkcJ0VVQ== X-Received: by 2002:a5d:4a81:: with SMTP id o1mr1599563wrq.177.1620718199386; Tue, 11 May 2021 00:29:59 -0700 (PDT) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Alex=20Benn=C3=A9e?= , Willian Rampazzo , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Thomas Huth , =?UTF-8?q?Daniel=20P=20=2E=20Berrang=C3=A9?= , Cleber Rosa , Wainer dos Santos Moschetta , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH v2 01/10] gitlab-ci: Replace YAML anchors by extends (acceptance_test_job) Date: Tue, 11 May 2021 09:29:43 +0200 Message-Id: <20210511072952.2813358-2-f4bug@amsat.org> X-Mailer: git-send-email 2.26.3 In-Reply-To: <20210511072952.2813358-1-f4bug@amsat.org> References: <20210511072952.2813358-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) From: Philippe Mathieu-Daud=C3=A9 '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 Reviewed-by: Wainer dos Santos Moschetta Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Willian Rampazzo --- .gitlab-ci.yml | 30 +++++++++++------------------- 1 file changed, 11 insertions(+), 19 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 66b3d8602ca..1d8ecc281b4 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -52,7 +52,8 @@ include: # Avoid recompiling by hiding ninja with NINJA=3D":" - make NINJA=3D":" $MAKE_CHECK_ARGS =20 -.acceptance_template: &acceptance_definition +.acceptance_test_job_template: + extends: .native_test_job_template cache: key: "${CI_JOB_NAME}-cache" paths: @@ -108,14 +109,13 @@ check-system-alpine: MAKE_CHECK_ARGS: check =20 acceptance-system-alpine: - extends: .native_test_job_template + extends: .acceptance_test_job_template needs: - job: build-system-alpine artifacts: true variables: IMAGE: alpine MAKE_CHECK_ARGS: check-acceptance - <<: *acceptance_definition =20 build-system-ubuntu: extends: .native_build_job_template @@ -142,14 +142,13 @@ check-system-ubuntu: MAKE_CHECK_ARGS: check =20 acceptance-system-ubuntu: - extends: .native_test_job_template + extends: .acceptance_test_job_template 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_template @@ -176,14 +175,13 @@ check-system-debian: MAKE_CHECK_ARGS: check =20 acceptance-system-debian: - extends: .native_test_job_template + extends: .acceptance_test_job_template 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_template @@ -211,14 +209,13 @@ check-system-fedora: MAKE_CHECK_ARGS: check =20 acceptance-system-fedora: - extends: .native_test_job_template + extends: .acceptance_test_job_template 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_template @@ -246,14 +243,13 @@ check-system-centos: MAKE_CHECK_ARGS: check =20 acceptance-system-centos: - extends: .native_test_job_template + extends: .acceptance_test_job_template needs: - job: build-system-centos artifacts: true variables: IMAGE: centos8 MAKE_CHECK_ARGS: check-acceptance - <<: *acceptance_definition =20 build-system-opensuse: extends: .native_build_job_template @@ -279,14 +275,13 @@ check-system-opensuse: MAKE_CHECK_ARGS: check =20 acceptance-system-opensuse: - extends: .native_test_job_template + extends: .acceptance_test_job_template needs: - job: build-system-opensuse artifacts: true variables: IMAGE: opensuse-leap MAKE_CHECK_ARGS: check-acceptance - <<: *acceptance_definition =20 =20 build-disabled: @@ -522,14 +517,13 @@ check-cfi-aarch64: MAKE_CHECK_ARGS: check =20 acceptance-cfi-aarch64: - extends: .native_test_job_template + extends: .acceptance_test_job_template needs: - job: build-cfi-aarch64 artifacts: true variables: IMAGE: fedora MAKE_CHECK_ARGS: check-acceptance - <<: *acceptance_definition =20 build-cfi-ppc64-s390x: extends: .native_build_job_template @@ -559,14 +553,13 @@ check-cfi-ppc64-s390x: MAKE_CHECK_ARGS: check =20 acceptance-cfi-ppc64-s390x: - extends: .native_test_job_template + extends: .acceptance_test_job_template needs: - job: build-cfi-ppc64-s390x artifacts: true variables: IMAGE: fedora MAKE_CHECK_ARGS: check-acceptance - <<: *acceptance_definition =20 build-cfi-x86_64: extends: .native_build_job_template @@ -596,14 +589,13 @@ check-cfi-x86_64: MAKE_CHECK_ARGS: check =20 acceptance-cfi-x86_64: - extends: .native_test_job_template + extends: .acceptance_test_job_template needs: - job: build-cfi-x86_64 artifacts: true variables: IMAGE: fedora MAKE_CHECK_ARGS: check-acceptance - <<: *acceptance_definition =20 tsan-build: extends: .native_build_job_template --=20 2.26.3