From nobody Wed Nov 19 22:23:32 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.44 as permitted sender) client-ip=209.85.221.44; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f44.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.44 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1618788913; cv=none; d=zohomail.com; s=zohoarc; b=L/69rrksN8cdGk7/eqSrdGHz5d1mx/XVruP9cAD2mYeSvcsbNnqvXEu0PCYgiEpSS32qY+SiH+AEZ0R1ev5e7JK38cYpidropS/zg0JT0VkWho8pBIRhcV8iYVqKMPwO8FF8LYr2y9zS1imH8s3PNtEOCjr1KB+nEHopU0xMOzw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1618788913; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=qcLXkvBe6T3rF4X/u6wiQxn9g8xfcysDobF2aflqITA=; b=fGJHlMcnk3LlGAsyVC/6S19z7xHZyWO6l62Y4b21Xzz/I772Rv0E0EDqB0FsOn/po9vjd9WPgeHU++FH9pzaM8yRVGV3JNkjGenaxpFt+wAJkOePoOF7iApLVO0PnjhD25Rf0h5BLh8UWbGiQbKDylSMr3zucejqwwyR5k36a3M= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.44 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wr1-f44.google.com (mail-wr1-f44.google.com [209.85.221.44]) by mx.zohomail.com with SMTPS id 1618788913029662.9194293026633; Sun, 18 Apr 2021 16:35:13 -0700 (PDT) Received: by mail-wr1-f44.google.com with SMTP id e5so3431349wrg.7 for ; Sun, 18 Apr 2021 16:35:12 -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 z14sm19241855wrs.96.2021.04.18.16.35.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 18 Apr 2021 16:35: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=qcLXkvBe6T3rF4X/u6wiQxn9g8xfcysDobF2aflqITA=; b=vhVJEZpW8e4Q4YlToLcil9FxE+S+TezqS1J5M73hb80olvfUZVsJYWAlI9eLBB1AqK B9RDJ0DWaC4+9CZcHEDudS73LpxGdxX6PPibtSzu9JRkGmj5fwtykwWevreKtxPeBdF+ vZkFzTNcSxcRzlf60R8mE25i1zanZkBBtO8Uz93Ad4L/HmLorTXHsWTJY97GSaTUt4sS N4ZX0xZVT7ZOw9NK95G9WVLrLYOiGQYmB7VK7cfFuD99eS5RfEZcUj6EfdZ4e8p7Il1T KLzrESQnlCs+ePoc7lRdKpjfwnxAz6SxWzsoic+nor664CFt1cpae8UUuCHnot8mYJ7l CUkw== 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=qcLXkvBe6T3rF4X/u6wiQxn9g8xfcysDobF2aflqITA=; b=cmET3xmkWNB9zQ9cup1oAynTgeHsgnFBj5gs6UIkA5N8R3OzrP1NsI0oK5z5oojj0W grwjQS/Vbwz+GgZI/3bjDj1zxJbW87b4NqITGKU/V894DDWtw5pNmMQquNvMZhwCBfQE NGgvcP8UaNBgXCkevjGN8VyTxSAB6Xs4WZwdzqTQ9ln3EguxEqkGMAFnkPcrPM6wX3qX Djx3iRxZUzbyOz3FZI3hV4yoOti9g//qKQqcVe4hHpHDRh06KPazALKaJptx+3LDyXyH txCvY+uUidmxQbEhum6rKbydHEk9NAzOb+xBZLqSlBf9p5E5hETzKIcF1iuqI3NZvXdz l3Rg== X-Gm-Message-State: AOAM532gLmGkIJreoQs7fk3OPoKfxmxT24RLSJbmII4y/tIqglVp07nv G1Hfua8KcDZiPmF78E2Kutk= X-Google-Smtp-Source: ABdhPJwGCetydwS+NvNWnoBhJZSpAVb7qR0cUvZgx2E/LRnGyU+/hjp49JXQUusHKmun4I8Gf7AWJA== X-Received: by 2002:a5d:67c8:: with SMTP id n8mr4256565wrw.200.1618788911223; Sun, 18 Apr 2021 16:35: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: Erik Skultety , Thomas Huth , Willian Rampazzo , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Miroslav Rezanina , Wainer dos Santos Moschetta , =?UTF-8?q?Daniel=20P=20=2E=20Berrang=C3=A9?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Cleber Rosa , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH 04/15] gitlab-ci: Replace YAML anchors by extends (acceptance_test_job) Date: Mon, 19 Apr 2021 01:34:37 +0200 Message-Id: <20210418233448.1267991-5-f4bug@amsat.org> X-Mailer: git-send-email 2.26.3 In-Reply-To: <20210418233448.1267991-1-f4bug@amsat.org> References: <20210418233448.1267991-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 --- .gitlab-ci.yml | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 11bda3abf33..07e5e737685 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -48,7 +48,7 @@ include: # Avoid recompiling by hiding ninja with NINJA=3D":" - make NINJA=3D":" $MAKE_CHECK_ARGS =20 -.acceptance_template: &acceptance_definition +.acceptance_test_job_template: cache: key: "${CI_JOB_NAME}-cache" paths: @@ -111,7 +111,7 @@ acceptance-system-alpine: variables: IMAGE: alpine MAKE_CHECK_ARGS: check-acceptance - <<: *acceptance_definition + extends: .acceptance_test_job_template =20 build-system-ubuntu: extends: .native_build_job_template @@ -145,7 +145,7 @@ acceptance-system-ubuntu: variables: IMAGE: ubuntu2004 MAKE_CHECK_ARGS: check-acceptance - <<: *acceptance_definition + extends: .acceptance_test_job_template =20 build-system-debian: extends: .native_build_job_template @@ -179,7 +179,7 @@ acceptance-system-debian: variables: IMAGE: debian-amd64 MAKE_CHECK_ARGS: check-acceptance - <<: *acceptance_definition + extends: .acceptance_test_job_template =20 build-system-fedora: extends: .native_build_job_template @@ -214,7 +214,7 @@ acceptance-system-fedora: variables: IMAGE: fedora MAKE_CHECK_ARGS: check-acceptance - <<: *acceptance_definition + extends: .acceptance_test_job_template =20 build-system-centos: extends: .native_build_job_template @@ -249,7 +249,7 @@ acceptance-system-centos: variables: IMAGE: centos8 MAKE_CHECK_ARGS: check-acceptance - <<: *acceptance_definition + extends: .acceptance_test_job_template =20 build-system-opensuse: extends: .native_build_job_template @@ -282,7 +282,7 @@ acceptance-system-opensuse: variables: IMAGE: opensuse-leap MAKE_CHECK_ARGS: check-acceptance - <<: *acceptance_definition + extends: .acceptance_test_job_template =20 =20 build-disabled: @@ -525,7 +525,7 @@ acceptance-cfi-aarch64: variables: IMAGE: fedora MAKE_CHECK_ARGS: check-acceptance - <<: *acceptance_definition + extends: .acceptance_test_job_template =20 build-cfi-ppc64-s390x: extends: .native_build_job_template @@ -562,7 +562,7 @@ acceptance-cfi-ppc64-s390x: variables: IMAGE: fedora MAKE_CHECK_ARGS: check-acceptance - <<: *acceptance_definition + extends: .acceptance_test_job_template =20 build-cfi-x86_64: extends: .native_build_job_template @@ -599,7 +599,7 @@ acceptance-cfi-x86_64: variables: IMAGE: fedora MAKE_CHECK_ARGS: check-acceptance - <<: *acceptance_definition + extends: .acceptance_test_job_template =20 tsan-build: extends: .native_build_job_template --=20 2.26.3