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.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 ARC-Seal: i=1; a=rsa-sha256; t=1618788902; cv=none; d=zohomail.com; s=zohoarc; b=c/OkTLW92UCbYcuhuXiTo/+qLhp0hablsBPCVa696ow5TLE5L2hnS3VqN/aeVuhsbDf7wpk5cMck9SJAu/jaOqduwruf/POvKCqNJ4EGgJFouy3Ca5odAbVcX6LtacoWK/p8rxSR7txAxtCZIyU0Ic6/1IsouG+6/uYWwGXUvbo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1618788902; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=4k10ItHi8X/62o5b3Q+1SRRAEz1STuAQuVd1i9kEo+M=; b=VzHjpWJaX7E+ZK3Lyjf4smMNWnPLKC1AXpueuBhxA0JR7cRlglcI/X2EiqDKJ0jobI53+4Cb+jgIA6TNUlFFTHEsy5sCFzcWq74KQEj/xum0VjfpbkRRjHWohH712vlXCZe4nUDEQX17T4fzDuEUBSwC+doiL7hfS0XqbdQRbSA= 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 Received: from mail-wr1-f46.google.com (mail-wr1-f46.google.com [209.85.221.46]) by mx.zohomail.com with SMTPS id 1618788902858641.1905547339688; Sun, 18 Apr 2021 16:35:02 -0700 (PDT) Received: by mail-wr1-f46.google.com with SMTP id s7so31991585wru.6 for ; Sun, 18 Apr 2021 16:35:02 -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 y125sm6617012wmc.40.2021.04.18.16.34.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 18 Apr 2021 16:35:00 -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=4k10ItHi8X/62o5b3Q+1SRRAEz1STuAQuVd1i9kEo+M=; b=sIe8NlKffV/yS7UIl7qhtIr0unhUbD9pVeyD9Du+99anG26q2HlqwBfI9WQ2c4ZRJr inJlkXuV2aW29L1dIxqsuTajDaVpkuTjdW/Kq71FOgHSkSfuUEV4f+RkbcWhgSJx3tZ5 6vct+sNPAiV74kzsgu1H9FCYRbO1ts6EOaOSlr3Aqx4UxBdoUych57ngIrT6xL7lhkAy U4Th4D3TerPCN8Jl7RVwE0rbwzlEFxZ5uU708AkNGheS4jbUUx63HKq3vIjxWeU0rj9Z HFs9xfZ70GFtKs5yPxkgxPncGazdH/1uFc4H+u28rB3m0ux1iqjfws/eRCKHNcBU3PxL kiRg== 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=4k10ItHi8X/62o5b3Q+1SRRAEz1STuAQuVd1i9kEo+M=; b=k4JjrSgECDjLoEv6mAfNGSQhbI/1g+twc97BbOSjSDqSqDmp18WO1l81qi9Izz4gz0 5joc8121bHTRNsUQNkvpmIKb4m46KfsVXXh/gSOwzlVLBjSi/Y0O1BwruVPfSFdrnchO it+bg184n6dLHlRC4kv9OEb5hnGkzeb7YRgKz+6aPIzgNEG/kZUn9dlrmLIJSUOGFoPI KFwGrAfBTIEXmjoOhC5lRlxl3pmSVr9a18iuYwX65ODs+0YYusQ/vR+tvjafc7E6OPDV zMy+6AWpMQhMxucDlGJefiO1BU/vYLtIL74nSYdBsyCVDxBBwsMX8GzU1iBd9NG8tzPn w1kw== X-Gm-Message-State: AOAM530DtZ/0thVltjuL9HJ4K6KvzhVR9y+XMVBMXKXoOnlhaY8nNqc0 kw5cEK9/n4ypCZTs6EHqZCBdSxEDTtTveA== X-Google-Smtp-Source: ABdhPJzArSrs6GV9nzAHxEM3zD/ZJ7moRILb/IiTTHiWbno7UN+4EnT5nM1BmKDF+myqzUofxghg5A== X-Received: by 2002:adf:e6cd:: with SMTP id y13mr11150050wrm.87.1618788901111; Sun, 18 Apr 2021 16:35:01 -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 02/15] gitlab-ci: Replace YAML anchors by extends (native_build_job) Date: Mon, 19 Apr 2021 01:34:35 +0200 Message-Id: <20210418233448.1267991-3-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 | 64 +++++++++++++++++++++++++------------------------- 1 file changed, 32 insertions(+), 32 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 52d65d6c04f..98d73429405 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -13,7 +13,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_template: stage: build image: $CI_REGISTRY_IMAGE/qemu/$IMAGE:latest before_script: @@ -79,7 +79,7 @@ include: - du -chs ${CI_PROJECT_DIR}/avocado-cache =20 build-system-alpine: - <<: *native_build_job_definition + extends: .native_build_job_template needs: - job: amd64-alpine-container variables: @@ -114,7 +114,7 @@ acceptance-system-alpine: <<: *acceptance_definition =20 build-system-ubuntu: - <<: *native_build_job_definition + extends: .native_build_job_template needs: job: amd64-ubuntu2004-container variables: @@ -148,7 +148,7 @@ acceptance-system-ubuntu: <<: *acceptance_definition =20 build-system-debian: - <<: *native_build_job_definition + extends: .native_build_job_template needs: job: amd64-debian-container variables: @@ -182,7 +182,7 @@ acceptance-system-debian: <<: *acceptance_definition =20 build-system-fedora: - <<: *native_build_job_definition + extends: .native_build_job_template needs: job: amd64-fedora-container variables: @@ -217,7 +217,7 @@ acceptance-system-fedora: <<: *acceptance_definition =20 build-system-centos: - <<: *native_build_job_definition + extends: .native_build_job_template needs: job: amd64-centos8-container variables: @@ -252,7 +252,7 @@ acceptance-system-centos: <<: *acceptance_definition =20 build-system-opensuse: - <<: *native_build_job_definition + extends: .native_build_job_template needs: job: amd64-opensuse-leap-container variables: @@ -286,7 +286,7 @@ acceptance-system-opensuse: =20 =20 build-disabled: - <<: *native_build_job_definition + extends: .native_build_job_template needs: job: amd64-fedora-container variables: @@ -373,7 +373,7 @@ build-disabled: # Also use a different coroutine implementation (which is only really of # interest to KVM users, i.e. with TCG disabled) build-tcg-disabled: - <<: *native_build_job_definition + extends: .native_build_job_template needs: job: amd64-centos8-container variables: @@ -396,7 +396,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_template needs: job: amd64-debian-user-cross-container variables: @@ -405,7 +405,7 @@ build-user: MAKE_CHECK_ARGS: check-tcg =20 build-user-static: - <<: *native_build_job_definition + extends: .native_build_job_template needs: job: amd64-debian-user-cross-container variables: @@ -415,7 +415,7 @@ build-user-static: =20 # Only build the softmmu targets we have check-tcg tests for build-some-softmmu: - <<: *native_build_job_definition + extends: .native_build_job_template needs: job: amd64-debian-user-cross-container variables: @@ -428,7 +428,7 @@ build-some-softmmu: # 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_template needs: job: amd64-debian-user-cross-container variables: @@ -438,7 +438,7 @@ build-user-plugins: timeout: 1h 30m =20 build-user-centos7: - <<: *native_build_job_definition + extends: .native_build_job_template needs: job: amd64-centos7-container variables: @@ -447,7 +447,7 @@ build-user-centos7: MAKE_CHECK_ARGS: check-tcg =20 build-some-softmmu-plugins: - <<: *native_build_job_definition + extends: .native_build_job_template needs: job: amd64-debian-user-cross-container variables: @@ -457,7 +457,7 @@ build-some-softmmu-plugins: MAKE_CHECK_ARGS: check-tcg =20 clang-system: - <<: *native_build_job_definition + extends: .native_build_job_template needs: job: amd64-fedora-container variables: @@ -469,7 +469,7 @@ clang-system: MAKE_CHECK_ARGS: check-qtest check-tcg =20 clang-user: - <<: *native_build_job_definition + extends: .native_build_job_template needs: job: amd64-debian-user-cross-container variables: @@ -491,7 +491,7 @@ clang-user: # Split in three sets of build/check/acceptance to limit the execution tim= e of each # job build-cfi-aarch64: - <<: *native_build_job_definition + extends: .native_build_job_template needs: - job: amd64-fedora-container variables: @@ -528,7 +528,7 @@ acceptance-cfi-aarch64: <<: *acceptance_definition =20 build-cfi-ppc64-s390x: - <<: *native_build_job_definition + extends: .native_build_job_template needs: - job: amd64-fedora-container variables: @@ -565,7 +565,7 @@ acceptance-cfi-ppc64-s390x: <<: *acceptance_definition =20 build-cfi-x86_64: - <<: *native_build_job_definition + extends: .native_build_job_template needs: - job: amd64-fedora-container variables: @@ -602,7 +602,7 @@ acceptance-cfi-x86_64: <<: *acceptance_definition =20 tsan-build: - <<: *native_build_job_definition + extends: .native_build_job_template needs: job: amd64-ubuntu2004-container variables: @@ -614,7 +614,7 @@ tsan-build: =20 # These targets are on the way out build-deprecated: - <<: *native_build_job_definition + extends: .native_build_job_template needs: job: amd64-debian-user-cross-container variables: @@ -641,7 +641,7 @@ check-deprecated: =20 # gprof/gcov are GCC features gprof-gcov: - <<: *native_build_job_definition + extends: .native_build_job_template needs: job: amd64-ubuntu2004-container variables: @@ -654,7 +654,7 @@ gprof-gcov: - ${CI_PROJECT_DIR}/scripts/ci/coverage-summary.sh =20 build-oss-fuzz: - <<: *native_build_job_definition + extends: .native_build_job_template needs: job: amd64-fedora-container variables: @@ -674,7 +674,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_template needs: job: amd64-debian-user-cross-container variables: @@ -699,7 +699,7 @@ build-tci: # Alternate coroutines implementations are only really of interest to KVM = users # However we can't test against KVM on Gitlab-CI so we can only run unit t= ests build-coroutine-sigaltstack: - <<: *native_build_job_definition + extends: .native_build_job_template needs: job: amd64-ubuntu2004-container variables: @@ -713,7 +713,7 @@ build-coroutine-sigaltstack: # These jobs test old gcrypt and nettle from RHEL7 # which had some API differences. crypto-old-nettle: - <<: *native_build_job_definition + extends: .native_build_job_template needs: job: amd64-centos7-container variables: @@ -723,7 +723,7 @@ crypto-old-nettle: MAKE_CHECK_ARGS: check =20 crypto-old-gcrypt: - <<: *native_build_job_definition + extends: .native_build_job_template needs: job: amd64-centos7-container variables: @@ -733,7 +733,7 @@ crypto-old-gcrypt: MAKE_CHECK_ARGS: check =20 crypto-only-gnutls: - <<: *native_build_job_definition + extends: .native_build_job_template needs: job: amd64-centos7-container variables: @@ -745,7 +745,7 @@ crypto-only-gnutls: =20 # Check our reduced build configurations build-without-default-devices: - <<: *native_build_job_definition + extends: .native_build_job_template needs: job: amd64-centos8-container variables: @@ -753,7 +753,7 @@ build-without-default-devices: CONFIGURE_ARGS: --without-default-devices --disable-user =20 build-without-default-features: - <<: *native_build_job_definition + extends: .native_build_job_template needs: job: amd64-debian-container variables: @@ -803,7 +803,7 @@ build-libvhost-user: # No targets are built here, just tools, docs, and unit tests. This # also feeds into the eventual documentation deployment steps later build-tools-and-docs-debian: - <<: *native_build_job_definition + extends: .native_build_job_template needs: job: amd64-debian-container variables: --=20 2.26.3