From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-21.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,MENTIONS_GIT_HOSTING,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7751BC433B4 for ; Sun, 18 Apr 2021 23:38:44 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id EB8B760FDA for ; Sun, 18 Apr 2021 23:38:43 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org EB8B760FDA Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=amsat.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:52900 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lYGzx-0004fM-NG for qemu-devel@archiver.kernel.org; Sun, 18 Apr 2021 19:38:41 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44326) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lYGwc-0000G3-IM for qemu-devel@nongnu.org; Sun, 18 Apr 2021 19:35:14 -0400 Received: from mail-wr1-x42c.google.com ([2a00:1450:4864:20::42c]:41704) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lYGwa-000364-Vw for qemu-devel@nongnu.org; Sun, 18 Apr 2021 19:35:14 -0400 Received: by mail-wr1-x42c.google.com with SMTP id k26so15672809wrc.8 for ; Sun, 18 Apr 2021 16:35:12 -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=bWoyAvQgbg/w69Mx69c75LJqyxsZ/RYHsh+UOLUtogNBF0hqPUMgQ00WX12vnEfm+Y GCyb2aJRvR3Lr0LHvEgbdrdFCVSmxBiqXgGhxyoYYCl2JjOK2cNanxtiavO0qRVtZsaM pjgK9nNU8G+fi1GIFOsESNsJ9JDsUEy1YmncX2WZRDSd0C9k3TWvsJLzNr+ml0sinzdX KHVoHnjx25HQuRW5Y8e7AMahyqufe8i1839QiJAV4uEaHwkurr4xTvFgpyG1zME3OUCu AAYdP1kbALeC/z++eJ4rZJxWbJsQA7PfbjUGpbVL4BDwrB/oKVO4G+PacHv4COebWK0/ hPzQ== X-Gm-Message-State: AOAM5302B9QKBW/9TdPQcIKQYjQ0WfUhmYqxAxkUMhuYxCDtAglOGBot 0qsuc85VN6kscnyJkRbvlljXQGCdqo4UYQ== 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) 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) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org 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: 8bit Received-SPF: pass client-ip=2a00:1450:4864:20::42c; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-x42c.google.com X-Spam_score_int: -14 X-Spam_score: -1.5 X-Spam_bar: - X-Spam_report: (-1.5 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.249, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.249, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Thomas Huth , =?UTF-8?q?Daniel=20P=20=2E=20Berrang=C3=A9?= , Erik Skultety , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Wainer dos Santos Moschetta , Willian Rampazzo , Cleber Rosa , Miroslav Rezanina , =?UTF-8?q?Alex=20Benn=C3=A9e?= Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" From: Philippe Mathieu-Daudé '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é --- .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=":" - make NINJA=":" $MAKE_CHECK_ARGS -.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 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 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 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 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 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 build-disabled: @@ -525,7 +525,7 @@ acceptance-cfi-aarch64: variables: IMAGE: fedora MAKE_CHECK_ARGS: check-acceptance - <<: *acceptance_definition + extends: .acceptance_test_job_template 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 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 tsan-build: extends: .native_build_job_template -- 2.26.3