From nobody Mon Feb 9 22:38:38 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.46 as permitted sender) client-ip=209.85.221.46; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f46.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.46 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com; dmarc=fail(p=none dis=none) header.from=amsat.org ARC-Seal: i=1; a=rsa-sha256; t=1621450513; cv=none; d=zohomail.com; s=zohoarc; b=Hmzol3T9DslCUV9kKgou1ubbtUiPL3AmnruOA3d5jPOmcVEDLL+j+JqqfdYBYFERGvQ/79MO103fefLHZebOBKUFLw+ogLp4so0y+B6iepNxXFPwA7/De+MQZ3uv54yQ3cwFkYiM+J/LfPooNPNZg8qmXdBiSNoENjP1FBotKhI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1621450513; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=focAcyrgaYB/hu+hbzPB7/PX+7KUYSEtTUHLMdtanj0=; b=VThN4dZqDb1wKYdisP8OHr3bi3oSYRHdV+PkVKf4HqLZ4HtVXnWYvUIQnnU3t/eJ5UpuG7ND6RN7EY0f+c/StYcB0ZYQlDYngfhGC4USoK3EBAkK3pI57E1Bv/sYOxmTgW2Es/qLw5Z7fwcOywvAFxJdZn0DNMgi398F+16XTtM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.46 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com; dmarc=fail header.from= (p=none dis=none) header.from= Received: from mail-wr1-f46.google.com (mail-wr1-f46.google.com [209.85.221.46]) by mx.zohomail.com with SMTPS id 1621450513500838.1736801926596; Wed, 19 May 2021 11:55:13 -0700 (PDT) Received: by mail-wr1-f46.google.com with SMTP id n2so15178150wrm.0 for ; Wed, 19 May 2021 11:55:12 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.redhat.com (31.red-83-51-215.dynamicip.rima-tde.net. [83.51.215.31]) by smtp.gmail.com with ESMTPSA id m10sm281927wrr.2.2021.05.19.11.55.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 19 May 2021 11:55:10 -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=focAcyrgaYB/hu+hbzPB7/PX+7KUYSEtTUHLMdtanj0=; b=C/ELoEuAM/t/O+SH8aXoMkAbKWCIHNGBTjLHg6N7/NHkIyp0Wkkeapt2S5Xux+TxDq iYoMF9owCbydA+fHE5jgu3eKIXPc+x8ErMpysZgtaVL659dG+zQsYD+IZRo+daRnzco+ zjCBBmPH2d2z2dZxFajTtPk65Br2UYLR/dYrSBEhaxM/6Djv8+WQgDhkDIMAME++N5j7 rpuf01Hmmp3PvyeF/hXGHZFa1xy4h7Ru3WEHZz9rooV1N55rs+9FaWgukD67MKDMKiFD 4f9f8RYKN8vCa6XmhnJrj6IthgIrmgIg8SwhF5ohsWvdE86+B/q8ukOMmsbxjwvRU6XQ zrhA== 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=focAcyrgaYB/hu+hbzPB7/PX+7KUYSEtTUHLMdtanj0=; b=IP4kOF48UYFgjOY7Pw9SamT6FRiUf5nKZD2VVjl5iuJSEL9agW/MY4lk1a++npvsC9 lNDagW1wTL9UKXFKefRls7t2zUipQt2ZkrnbHwd1o+ayrDmPKnRY7aDF5KkbiGrnYNt5 D100xuQhhpeNJ6H8xZqSveIMz9q2binsSgwQZjMp1ZrOxsy91m6KkJtiKAPa0SuyhSzZ 0ogzvXfl7L3hHB9RTm65sR141hr8hGjS0/x9XQgUzOTg5mx1tGATTizZRuLp8XASb9HW waFrTY/24dtp8KKQnYZbyRkx8ZBjwvEExYZ9Ag88cnmAv2DTy3zmzvTy4OLuII8noGCc U71Q== X-Gm-Message-State: AOAM531nVTtCq+jcllNPKiEADtYtsS6TQEhlaGIgs9aCo/2q2L+nXCSv Nvu/04AKtQPdM3rmuEpyhmM= X-Google-Smtp-Source: ABdhPJzT1I/VZwefmFliAzGhSLS163oPpe2Yr/2ipKEL1PSre/eAmzBV0aEphhGKXTw741ehWg2ECw== X-Received: by 2002:adf:f309:: with SMTP id i9mr362701wro.307.1621450511771; Wed, 19 May 2021 11:55:11 -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: Thomas Huth , =?UTF-8?q?Daniel=20P=20=2E=20Berrang=C3=A9?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Cleber Rosa , Wainer dos Santos Moschetta , Willian Rampazzo , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH v3 01/10] gitlab-ci: Replace YAML anchors by extends (acceptance_test_job) Date: Wed, 19 May 2021 20:54:55 +0200 Message-Id: <20210519185504.2198573-2-f4bug@amsat.org> X-Mailer: git-send-email 2.26.3 In-Reply-To: <20210519185504.2198573-1-f4bug@amsat.org> References: <20210519185504.2198573-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 Reviewed-by: Willian Rampazzo Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- .gitlab-ci.yml | 30 +++++++++++------------------- 1 file changed, 11 insertions(+), 19 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 24f300aacea..6a36f8299bf 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: @@ -521,14 +516,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 @@ -558,14 +552,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 @@ -595,14 +588,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