From nobody Mon Feb 9 12:26:11 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) client-ip=216.205.24.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 216.205.24.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=1605024139; cv=none; d=zohomail.com; s=zohoarc; b=PFgKkCFKQ6S+eHnu8WtDHlGWIv5vFBYU2soZYJOs2PGMszFYJPbyxe+lCIFmESwPGZYWLQ8/i91ap9ntxy70skM3VQA+Tv22Bc0ZGj1q1XAM4WpdfsTKJB11E0+UDUnjTO50eh7okl2iaszHxRC7Y3E4aAW0F7fIuWs55oY31AU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1605024139; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=3y1C5StOcNT1GPWvuNwXUSiFTVKqm5kP9TOY3ZYBopk=; b=GOYy1Wi3nvPr/6Bww2GQUPU2hiqfiAQtps68tLQ6jIpTN3N4sjboCz5FzHvNrTWyxY5tPHSPxabJbJetAldn74FSkRV83ITk3NHOxD3PyKHYCMtpXXEliG/MU7TknPcEPap51wkTkzORPIw7mhzWnY2mhTxVA1pxe7s3kv6eRN0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.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 [216.205.24.124]) by mx.zohomail.com with SMTPS id 1605024139429765.8341536443187; Tue, 10 Nov 2020 08:02:19 -0800 (PST) Received: from mail-wr1-f69.google.com (mail-wr1-f69.google.com [209.85.221.69]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-537-RB0JW3KqPFykrd3I9gNN2A-1; Tue, 10 Nov 2020 11:02:14 -0500 Received: by mail-wr1-f69.google.com with SMTP id 67so5909149wra.2 for ; Tue, 10 Nov 2020 08:02:14 -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 l24sm3464456wmi.7.2020.11.10.08.02.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 Nov 2020 08:02:08 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1605024136; 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=3y1C5StOcNT1GPWvuNwXUSiFTVKqm5kP9TOY3ZYBopk=; b=DJKHjt+K8murXpst60avUccdX377uB5SVTHWhghlvNEPB9COwUUMxSIuWntgzvFkTrfe8V TtBcBL7lUsTtkt1bWLi4jtAQiZ4zezmbZ5rMu2JQC9Sdrs2oKnDdGP+FzjYDONwYdRB0i4 g5uFctVeKvFwlch0/HGDmqzVy8pkUlQ= X-MC-Unique: RB0JW3KqPFykrd3I9gNN2A-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=3y1C5StOcNT1GPWvuNwXUSiFTVKqm5kP9TOY3ZYBopk=; b=fIcK+MIB67S7c7YeKtYepC4arl/1UnJ7ifaKyWnnJC2SIsX8Ukr5lIhA50KvDiiwIX /NUTkoQRT4zQ64LkAggqMksUtgr/5MmTTcPUFjBSAMg218b9IlA7iOmrKuG4XTO6ctX+ DxWoy/RwZ69RP8l6RruV/9M3HTT90HKmvbUHdKbGmr0W1qPmDtt38XX23Linc6SJUAVV rrBkRTjKqE7Bd53Xc7eJHMsyk91kfICvePm8r2SO6RqW+bkMJDU/nADA3jP3QsrrWq+U gzBx8R0fJsYCqPbpQkkMpNa0um5c8kdrECy6z/CtpskiyKT8DTi5mnsTidKsEW6oWEOB /Icg== X-Gm-Message-State: AOAM531MXHHOCEDn9UDqGJXvMKvA0c6aBvZXTzoQSUKsc2T4g6Z88uxu p7jyh0XRDWRgNkkPVSd3L8x5do9QRKOt8+8QfY1eKepPvxLNMQ/IMYYXxB3QVLeOaFHm+3PGg5p 8Yg3JzshgL6SFSw== X-Received: by 2002:a7b:c846:: with SMTP id c6mr338108wml.143.1605024129331; Tue, 10 Nov 2020 08:02:09 -0800 (PST) X-Google-Smtp-Source: ABdhPJwpFlwK18+nTDZDJlvzoPMQchVMptLlTDuTQzWnlqe5ftTgtiPui0Vi+Ml+aSIX+HUaBSN8Kg== X-Received: by 2002:a7b:c846:: with SMTP id c6mr338085wml.143.1605024129137; Tue, 10 Nov 2020 08:02:09 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Laszlo Ersek , "Daniel P . Berrange" , Stefan Weil , Wainer dos Santos Moschetta , Fam Zheng , virt-ci-maint-team@redhat.com, Michael Tokarev , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Bin Meng , Bin Meng , Thomas Huth , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [RFC PATCH 05/16] gitlab-ci: Replace YAML anchors by extends (container_job) Date: Tue, 10 Nov 2020 17:01:29 +0100 Message-Id: <20201110160140.2859904-6-philmd@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20201110160140.2859904-1-philmd@redhat.com> References: <20201110160140.2859904-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.d/containers.yml | 72 ++++++++++++++++++------------------- 1 file changed, 36 insertions(+), 36 deletions(-) diff --git a/.gitlab-ci.d/containers.yml b/.gitlab-ci.d/containers.yml index 11d079ea581..7e664878cab 100644 --- a/.gitlab-ci.d/containers.yml +++ b/.gitlab-ci.d/containers.yml @@ -1,4 +1,4 @@ -.container_job_template: &container_job_definition +.container_job: image: docker:stable stage: containers services: @@ -29,220 +29,220 @@ - if: '$CI_COMMIT_REF_NAME =3D=3D "testing/next"' =20 amd64-centos7-container: - <<: *container_job_definition + extends: .container_job variables: NAME: centos7 =20 amd64-centos8-container: - <<: *container_job_definition + extends: .container_job variables: NAME: centos8 =20 amd64-debian10-container: - <<: *container_job_definition + extends: .container_job variables: NAME: debian10 =20 amd64-debian11-container: - <<: *container_job_definition + extends: .container_job variables: NAME: debian11 =20 alpha-debian-cross-container: - <<: *container_job_definition + extends: .container_job stage: containers-layer2 needs: ['amd64-debian10-container'] variables: NAME: debian-alpha-cross =20 amd64-debian-cross-container: - <<: *container_job_definition + extends: .container_job stage: containers-layer2 needs: ['amd64-debian10-container'] variables: NAME: debian-amd64-cross =20 amd64-debian-user-cross-container: - <<: *container_job_definition + extends: .container_job stage: containers-layer2 needs: ['amd64-debian10-container'] variables: NAME: debian-all-test-cross =20 amd64-debian-container: - <<: *container_job_definition + extends: .container_job stage: containers-layer2 needs: ['amd64-debian10-container'] variables: NAME: debian-amd64 =20 arm64-debian-cross-container: - <<: *container_job_definition + extends: .container_job stage: containers-layer2 needs: ['amd64-debian10-container'] variables: NAME: debian-arm64-cross =20 arm64-test-debian-cross-container: - <<: *container_job_definition + extends: .container_job stage: containers-layer2 needs: ['amd64-debian11-container'] variables: NAME: debian-arm64-test-cross =20 armel-debian-cross-container: - <<: *container_job_definition + extends: .container_job stage: containers-layer2 needs: ['amd64-debian10-container'] variables: NAME: debian-armel-cross =20 armhf-debian-cross-container: - <<: *container_job_definition + extends: .container_job stage: containers-layer2 needs: ['amd64-debian10-container'] variables: NAME: debian-armhf-cross =20 hppa-debian-cross-container: - <<: *container_job_definition + extends: .container_job stage: containers-layer2 needs: ['amd64-debian10-container'] variables: NAME: debian-hppa-cross =20 m68k-debian-cross-container: - <<: *container_job_definition + extends: .container_job stage: containers-layer2 needs: ['amd64-debian10-container'] variables: NAME: debian-m68k-cross =20 mips64-debian-cross-container: - <<: *container_job_definition + extends: .container_job stage: containers-layer2 needs: ['amd64-debian10-container'] variables: NAME: debian-mips64-cross =20 mips64el-debian-cross-container: - <<: *container_job_definition + extends: .container_job stage: containers-layer2 needs: ['amd64-debian10-container'] variables: NAME: debian-mips64el-cross =20 mips-debian-cross-container: - <<: *container_job_definition + extends: .container_job stage: containers-layer2 needs: ['amd64-debian10-container'] variables: NAME: debian-mips-cross =20 mipsel-debian-cross-container: - <<: *container_job_definition + extends: .container_job stage: containers-layer2 needs: ['amd64-debian10-container'] variables: NAME: debian-mipsel-cross =20 powerpc-debian-cross-container: - <<: *container_job_definition + extends: .container_job stage: containers-layer2 needs: ['amd64-debian10-container'] variables: NAME: debian-powerpc-cross =20 ppc64-debian-cross-container: - <<: *container_job_definition + extends: .container_job stage: containers-layer2 needs: ['amd64-debian10-container'] variables: NAME: debian-ppc64-cross =20 ppc64el-debian-cross-container: - <<: *container_job_definition + extends: .container_job stage: containers-layer2 needs: ['amd64-debian10-container'] variables: NAME: debian-ppc64el-cross =20 riscv64-debian-cross-container: - <<: *container_job_definition + extends: .container_job stage: containers-layer2 needs: ['amd64-debian10-container'] variables: NAME: debian-riscv64-cross =20 s390x-debian-cross-container: - <<: *container_job_definition + extends: .container_job stage: containers-layer2 needs: ['amd64-debian10-container'] variables: NAME: debian-s390x-cross =20 sh4-debian-cross-container: - <<: *container_job_definition + extends: .container_job stage: containers-layer2 needs: ['amd64-debian10-container'] variables: NAME: debian-sh4-cross =20 sparc64-debian-cross-container: - <<: *container_job_definition + extends: .container_job stage: containers-layer2 needs: ['amd64-debian10-container'] variables: NAME: debian-sparc64-cross =20 tricore-debian-cross-container: - <<: *container_job_definition + extends: .container_job stage: containers-layer2 needs: ['amd64-debian10-container'] variables: NAME: debian-tricore-cross =20 xtensa-debian-cross-container: - <<: *container_job_definition + extends: .container_job variables: NAME: debian-xtensa-cross =20 cris-fedora-cross-container: - <<: *container_job_definition + extends: .container_job variables: NAME: fedora-cris-cross =20 amd64-fedora-container: - <<: *container_job_definition + extends: .container_job variables: NAME: fedora =20 i386-fedora-cross-container: - <<: *container_job_definition + extends: .container_job variables: NAME: fedora-i386-cross =20 win32-fedora-cross-container: - <<: *container_job_definition + extends: .container_job variables: NAME: fedora-win32-cross =20 win64-fedora-cross-container: - <<: *container_job_definition + extends: .container_job variables: NAME: fedora-win64-cross =20 amd64-ubuntu1804-container: - <<: *container_job_definition + extends: .container_job variables: NAME: ubuntu1804 =20 amd64-ubuntu2004-container: - <<: *container_job_definition + extends: .container_job variables: NAME: ubuntu2004 =20 amd64-ubuntu-container: - <<: *container_job_definition + extends: .container_job variables: NAME: ubuntu --=20 2.26.2