From nobody Mon Nov 17 15:59:37 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) client-ip=63.128.21.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 63.128.21.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=1604529975; cv=none; d=zohomail.com; s=zohoarc; b=WfvvkcmmVKs65Vuil8hDlOMCSI2CFr/NYlEjpaiYoEHP1tuWaisdzUlEo1dadrnAFCAFxvl5r9h9wBhbzNHZSryjNLHjxoqFRT4G0f/9YXf0VMmJd283JlBS0TV6y+2NyB5Fx2L18RBnqzGoX4IbwkHlXYIvi18Biv1Y3aMyvYk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1604529975; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=vsIvdkHwnKN3ES/j+SRDmVheqNblhIaZFAjIMTXNIXk=; b=OuWFxOgqKDOQFIoZSYRvA+bFKYpFwd9+upjc7yffi7zGBtbl+p/9nK1ZVgWR1lyYklHSTYHyAyWBpKvIM+F5bHx9H1gu90Lb4Nvwgg/9bhjnJb0+JT6PszhaVdo9S/48dhDY91MpIVGu9StuP3v5uw9uF/IAmypDXSqGKEurNZk= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.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 [63.128.21.124]) by mx.zohomail.com with SMTPS id 1604529975449777.8299256925355; Wed, 4 Nov 2020 14:46:15 -0800 (PST) Received: from mail-wm1-f70.google.com (mail-wm1-f70.google.com [209.85.128.70]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-490-jDu68b6iMt6gS0K9aNqvRQ-1; Wed, 04 Nov 2020 17:46:12 -0500 Received: by mail-wm1-f70.google.com with SMTP id y187so1812385wmy.3 for ; Wed, 04 Nov 2020 14:46:12 -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 t74sm3778774wmt.8.2020.11.04.14.46.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 04 Nov 2020 14:46:10 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1604529974; 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=vsIvdkHwnKN3ES/j+SRDmVheqNblhIaZFAjIMTXNIXk=; b=BC7cpdqvDzDi+CKsjfEK0i7j3fwQyYgiLQ+fkDDWLlCrE90wbURWsueKVo27xClApAdW+A //3Mi8GJN6uzh3Yx0oFHdQ50DOgLi4Oe8Flfmf74d9jvwAESjkA++vfanKa2aaty1xD+9a 4X6BSfQllI+Qai6rFs+W65pqaU1lE2Y= X-MC-Unique: jDu68b6iMt6gS0K9aNqvRQ-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=vsIvdkHwnKN3ES/j+SRDmVheqNblhIaZFAjIMTXNIXk=; b=KTr9jUSiMST0aDt2GZzsZmS0nBRWX9MRB5sES2i2MK6ljCmCNO8Ds5TsTbB2gciS+h yKz7qL3OdA9qvOvVN8oJA3oIQAPtI2Jb3a00emse9YQjqJN6VGnUIKl3sM7oGZtc4wD5 2JAnL2XYxh4MFXGX+ajgpkY8NC6DiQUQo1pu5+fPwLqVVLSGCGCElEFz+DSSr4Eth3r6 EjuoWPrwgvARz+nKOcrpLbrdWq7KNNxm1F6QdyOzen0n7K4VEVrLADwRh/lXLnnuf+D4 DfeybkYyBYnJFy+91UpgPpzrrrBChYd7zUxByy+hhgCklEGZ7BcLzmxCoaOMe/PKDeqQ RNmg== X-Gm-Message-State: AOAM532SqDCem0JG2jTpFBvGEZcrrNyrk7HUQksPhlkm+rVfE3e0ReYM 7ghn0I87OhjsrsZ4LBzCYBWyxcrQ30PKYFwboWs9UZmqt9pfF///J+SbQJmpVGIGrrChcKFXurA t/kfWX6tHEGG3gg== X-Received: by 2002:a1c:4c0a:: with SMTP id z10mr5756189wmf.96.1604529971300; Wed, 04 Nov 2020 14:46:11 -0800 (PST) X-Google-Smtp-Source: ABdhPJw3sDhuJuuobcSW+Fw6a4iU+c/lDx9jzHthNB2Hi4OpfK0MQKD5Q5ir9eznjmIGZAKG9NlAZA== X-Received: by 2002:a1c:4c0a:: with SMTP id z10mr5756179wmf.96.1604529971141; Wed, 04 Nov 2020 14:46:11 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: "Daniel P . Berrange" , John Snow , Cornelia Huck , =?UTF-8?q?Alex=20Benn=C3=A9e?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Wainer dos Santos Moschetta , Thomas Huth , Peter Maydell Subject: [RFC PATCH 2/9] gitlab-ci: Replace YAML anchors by extends (native_build_job) Date: Wed, 4 Nov 2020 23:45:51 +0100 Message-Id: <20201104224558.3384595-3-philmd@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20201104224558.3384595-1-philmd@redhat.com> References: <20201104224558.3384595-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.yml | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 3b15ae5c302..ff3a8bd58cf 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -19,7 +19,7 @@ include: - local: '/.gitlab-ci.d/containers.yml' - local: '/.gitlab-ci.d/crossbuilds.yml' =20 -.native_build_job_template: &native_build_job_definition +.native_build_job: stage: build image: $CI_REGISTRY_IMAGE/qemu/$IMAGE:latest before_script: @@ -74,7 +74,7 @@ include: - du -chs ${CI_PROJECT_DIR}/avocado-cache =20 build-system-ubuntu: - <<: *native_build_job_definition + extends: .native_build_job variables: IMAGE: ubuntu2004 TARGETS: aarch64-softmmu alpha-softmmu cris-softmmu hppa-softmmu @@ -105,7 +105,7 @@ acceptance-system-ubuntu: <<: *acceptance_definition =20 build-system-debian: - <<: *native_build_job_definition + extends: .native_build_job variables: IMAGE: debian-amd64 TARGETS: arm-softmmu avr-softmmu i386-softmmu mipsel-softmmu @@ -136,7 +136,7 @@ acceptance-system-debian: <<: *acceptance_definition =20 build-system-fedora: - <<: *native_build_job_definition + extends: .native_build_job variables: IMAGE: fedora CONFIGURE_ARGS: --disable-gcrypt --enable-nettle @@ -168,7 +168,7 @@ acceptance-system-fedora: <<: *acceptance_definition =20 build-system-centos: - <<: *native_build_job_definition + extends: .native_build_job variables: IMAGE: centos8 CONFIGURE_ARGS: --disable-nettle --enable-gcrypt @@ -200,7 +200,7 @@ acceptance-system-centos: <<: *acceptance_definition =20 build-disabled: - <<: *native_build_job_definition + extends: .native_build_job variables: IMAGE: fedora CONFIGURE_ARGS: --disable-attr --disable-avx2 --disable-bochs @@ -225,7 +225,7 @@ build-disabled: MAKE_CHECK_ARGS: check-qtest SPEED=3Dslow =20 build-tcg-disabled: - <<: *native_build_job_definition + extends: .native_build_job variables: IMAGE: centos8 script: @@ -245,7 +245,7 @@ build-tcg-disabled: 260 261 262 263 264 270 272 273 277 279 =20 build-user: - <<: *native_build_job_definition + extends: .native_build_job variables: IMAGE: debian-all-test-cross CONFIGURE_ARGS: --disable-tools --disable-system @@ -255,7 +255,7 @@ build-user: # we skip sparc64-linux-user until it has been fixed somewhat # we skip cris-linux-user as it doesn't use the common run loop build-user-plugins: - <<: *native_build_job_definition + extends: .native_build_job variables: IMAGE: debian-all-test-cross CONFIGURE_ARGS: --disable-tools --disable-system --enable-plugins --en= able-debug-tcg --target-list-exclude=3Dsparc64-linux-user,cris-linux-user @@ -263,7 +263,7 @@ build-user-plugins: timeout: 1h 30m =20 build-clang: - <<: *native_build_job_definition + extends: .native_build_job variables: IMAGE: fedora CONFIGURE_ARGS: --cc=3Dclang --cxx=3Dclang++ @@ -273,7 +273,7 @@ build-clang: =20 # These targets are on the way out build-deprecated: - <<: *native_build_job_definition + extends: .native_build_job variables: IMAGE: debian-all-test-cross CONFIGURE_ARGS: --disable-docs --disable-tools @@ -298,7 +298,7 @@ check-deprecated: allow_failure: true =20 build-oss-fuzz: - <<: *native_build_job_definition + extends: .native_build_job variables: IMAGE: fedora script: @@ -316,7 +316,7 @@ build-oss-fuzz: - cd build-oss-fuzz && make check-qtest-i386 check-unit =20 build-tci: - <<: *native_build_job_definition + extends: .native_build_job variables: IMAGE: fedora script: @@ -341,7 +341,7 @@ build-tci: # These jobs test old gcrypt and nettle from RHEL7 # which had some API differences. build-crypto-old-nettle: - <<: *native_build_job_definition + extends: .native_build_job variables: IMAGE: centos7 TARGETS: x86_64-softmmu x86_64-linux-user @@ -362,7 +362,7 @@ check-crypto-old-nettle: =20 =20 build-crypto-old-gcrypt: - <<: *native_build_job_definition + extends: .native_build_job variables: IMAGE: centos7 TARGETS: x86_64-softmmu x86_64-linux-user @@ -383,7 +383,7 @@ check-crypto-old-gcrypt: =20 =20 build-crypto-only-gnutls: - <<: *native_build_job_definition + extends: .native_build_job variables: IMAGE: centos7 TARGETS: x86_64-softmmu x86_64-linux-user --=20 2.26.2