From nobody Wed Nov 19 22:23:34 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.43 as permitted sender) client-ip=209.85.221.43; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f43.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.43 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1618788897; cv=none; d=zohomail.com; s=zohoarc; b=Hvotxv9vVEjG3e/l9+NzYfMbtYZOzUhEWYGNxrwCVIE6j+LeEgYa5Cy1MMNXvp9uXYwsc3g/8LuxBZk4nMtZ5TtP7k0s4vL2fsWVVnW/RGcV4tdghG/rUzmuggJJXtaBycj4NFNBIaKDpgLo02OAkpSip3s2feTaVPz6hb7yOKs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1618788897; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=1hXnyveSLJsQ7n0YcKe7UrZPwhbG4ssbFPID1DDVw8E=; b=Tq5vaa1P7evg+0stkWqbRAFq7MUu6Pi0Xr+TdxJpLLSRHri4webu8P9VT5K/0MzWIAAuINMUlX7UbD7hiwEXkUchqhhNatI9TO55/8Zbx5EyRFwNtqMxDc83KHvw+ZncdlxgtguwSDWRShn2Rcm7EDi95NlNqm2WsSsBOKINr48= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.43 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wr1-f43.google.com (mail-wr1-f43.google.com [209.85.221.43]) by mx.zohomail.com with SMTPS id 1618788897910623.5509826548459; Sun, 18 Apr 2021 16:34:57 -0700 (PDT) Received: by mail-wr1-f43.google.com with SMTP id x7so32063503wrw.10 for ; Sun, 18 Apr 2021 16:34:57 -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 h2sm17787030wmc.24.2021.04.18.16.34.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 18 Apr 2021 16:34:55 -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=1hXnyveSLJsQ7n0YcKe7UrZPwhbG4ssbFPID1DDVw8E=; b=unIf2a+vtqiwBehGW7gFu33pJN01KVamOGzD/Zk2ELU61IAsAXDQTHDhOxEkLLEWzh A2HbKeTMGxFveXxoc2suCfdDp5IDOBG7kvHFVvBtaHKHPZKsh0SyBZ5uo997zSod7Ybj q51hrCbA66RJIQmBxoJ7znCIC1QgB871aTvlAhFkP6ITAJ5WjayxhuNyzn203MLNLOIa GfJPYytx/HybudctqYyLnh+7lDpzp2R+xqDboCj2PMiXbcUz5hVh0agTEmutc3cXfzol rhiTrMLWVu+6pDXt/JOneN6hkvsTUMVyC1OsVJT5jXKUHy0H5qBxqDdZTlf5jv9OfyAp T66w== 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=1hXnyveSLJsQ7n0YcKe7UrZPwhbG4ssbFPID1DDVw8E=; b=PhTV1+iQhEZm8ekqF/DR/H3rdv3P+u9lo2cOD8g4XVtEllHWHPtGvSasALOXFLNf1P bYgQmB02LgYn6LFElE5JxkbqxEA76l0dnGTTBVkvGfvLZlXiZNsD6AAd4/RbC7QC5xy/ rwEl5hEQHMest0mWamh9z2Rwcl8vSeYhX9g8OA2nHSOj6JYbbjdpds20VZMheRMDGOo4 KHs0A4A8plPh/Rt0ImalO5FEztDqJk4jUr4Bb2F0k3aX+Tk267C1vOsqP+jFeEPqnW66 3nlFejRus0QIQueF7hnKEAUS/UlIE+a3S+kDWkQkum51jargMMcElvatUs8pTlUps9lE AQkw== X-Gm-Message-State: AOAM533RMWiKk82ofKWYARvq4gDWyynQCKf/scr6KwUowaF6XxGVF4ou i0FZWwJCB8rU+C3OueSw57g= X-Google-Smtp-Source: ABdhPJzi7UocJcqejlapWYin8XqCLgJWtA/fTETFHHQeq1hi+asbhGFnm4OoLNWUTKg+d9QkL9zR2A== X-Received: by 2002:a5d:524e:: with SMTP id k14mr10909969wrc.282.1618788896216; Sun, 18 Apr 2021 16:34:56 -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 01/15] gitlab-ci: Replace YAML anchors by extends (container_job) Date: Mon, 19 Apr 2021 01:34:34 +0200 Message-Id: <20210418233448.1267991-2-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 Reviewed-by: Thomas Huth Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- .gitlab-ci.d/containers.yml | 76 ++++++++++++++++++------------------- 1 file changed, 38 insertions(+), 38 deletions(-) diff --git a/.gitlab-ci.d/containers.yml b/.gitlab-ci.d/containers.yml index 33e4046e233..4ef76d1f54d 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_template: image: docker:stable stage: containers services: @@ -22,230 +22,230 @@ - docker logout =20 amd64-alpine-container: - <<: *container_job_definition + extends: .container_job_template variables: NAME: alpine =20 amd64-centos7-container: - <<: *container_job_definition + extends: .container_job_template variables: NAME: centos7 =20 amd64-centos8-container: - <<: *container_job_definition + extends: .container_job_template variables: NAME: centos8 =20 amd64-debian10-container: - <<: *container_job_definition + extends: .container_job_template variables: NAME: debian10 =20 amd64-debian11-container: - <<: *container_job_definition + extends: .container_job_template variables: NAME: debian11 =20 alpha-debian-cross-container: - <<: *container_job_definition + extends: .container_job_template stage: containers-layer2 needs: ['amd64-debian10-container'] variables: NAME: debian-alpha-cross =20 amd64-debian-cross-container: - <<: *container_job_definition + extends: .container_job_template stage: containers-layer2 needs: ['amd64-debian10-container'] variables: NAME: debian-amd64-cross =20 amd64-debian-user-cross-container: - <<: *container_job_definition + extends: .container_job_template stage: containers-layer2 needs: ['amd64-debian10-container'] variables: NAME: debian-all-test-cross =20 amd64-debian-container: - <<: *container_job_definition + extends: .container_job_template stage: containers-layer2 needs: ['amd64-debian10-container'] variables: NAME: debian-amd64 =20 arm64-debian-cross-container: - <<: *container_job_definition + extends: .container_job_template stage: containers-layer2 needs: ['amd64-debian10-container'] variables: NAME: debian-arm64-cross =20 arm64-test-debian-cross-container: - <<: *container_job_definition + extends: .container_job_template stage: containers-layer2 needs: ['amd64-debian11-container'] variables: NAME: debian-arm64-test-cross =20 armel-debian-cross-container: - <<: *container_job_definition + extends: .container_job_template stage: containers-layer2 needs: ['amd64-debian10-container'] variables: NAME: debian-armel-cross =20 armhf-debian-cross-container: - <<: *container_job_definition + extends: .container_job_template stage: containers-layer2 needs: ['amd64-debian10-container'] variables: NAME: debian-armhf-cross =20 hppa-debian-cross-container: - <<: *container_job_definition + extends: .container_job_template stage: containers-layer2 needs: ['amd64-debian10-container'] variables: NAME: debian-hppa-cross =20 m68k-debian-cross-container: - <<: *container_job_definition + extends: .container_job_template stage: containers-layer2 needs: ['amd64-debian10-container'] variables: NAME: debian-m68k-cross =20 mips64-debian-cross-container: - <<: *container_job_definition + extends: .container_job_template stage: containers-layer2 needs: ['amd64-debian10-container'] variables: NAME: debian-mips64-cross =20 mips64el-debian-cross-container: - <<: *container_job_definition + extends: .container_job_template stage: containers-layer2 needs: ['amd64-debian10-container'] variables: NAME: debian-mips64el-cross =20 mips-debian-cross-container: - <<: *container_job_definition + extends: .container_job_template stage: containers-layer2 needs: ['amd64-debian10-container'] variables: NAME: debian-mips-cross =20 mipsel-debian-cross-container: - <<: *container_job_definition + extends: .container_job_template stage: containers-layer2 needs: ['amd64-debian10-container'] variables: NAME: debian-mipsel-cross =20 powerpc-debian-cross-container: - <<: *container_job_definition + extends: .container_job_template stage: containers-layer2 needs: ['amd64-debian10-container'] variables: NAME: debian-powerpc-cross =20 ppc64-debian-cross-container: - <<: *container_job_definition + extends: .container_job_template stage: containers-layer2 needs: ['amd64-debian10-container'] variables: NAME: debian-ppc64-cross =20 ppc64el-debian-cross-container: - <<: *container_job_definition + extends: .container_job_template stage: containers-layer2 needs: ['amd64-debian10-container'] variables: NAME: debian-ppc64el-cross =20 riscv64-debian-cross-container: - <<: *container_job_definition + extends: .container_job_template stage: containers-layer2 needs: ['amd64-debian10-container'] variables: NAME: debian-riscv64-cross =20 s390x-debian-cross-container: - <<: *container_job_definition + extends: .container_job_template stage: containers-layer2 needs: ['amd64-debian10-container'] variables: NAME: debian-s390x-cross =20 sh4-debian-cross-container: - <<: *container_job_definition + extends: .container_job_template stage: containers-layer2 needs: ['amd64-debian10-container'] variables: NAME: debian-sh4-cross =20 sparc64-debian-cross-container: - <<: *container_job_definition + extends: .container_job_template stage: containers-layer2 needs: ['amd64-debian10-container'] variables: NAME: debian-sparc64-cross =20 tricore-debian-cross-container: - <<: *container_job_definition + extends: .container_job_template stage: containers-layer2 needs: ['amd64-debian10-container'] variables: NAME: debian-tricore-cross =20 xtensa-debian-cross-container: - <<: *container_job_definition + extends: .container_job_template variables: NAME: debian-xtensa-cross =20 cris-fedora-cross-container: - <<: *container_job_definition + extends: .container_job_template variables: NAME: fedora-cris-cross =20 amd64-fedora-container: - <<: *container_job_definition + extends: .container_job_template variables: NAME: fedora =20 i386-fedora-cross-container: - <<: *container_job_definition + extends: .container_job_template variables: NAME: fedora-i386-cross =20 win32-fedora-cross-container: - <<: *container_job_definition + extends: .container_job_template variables: NAME: fedora-win32-cross =20 win64-fedora-cross-container: - <<: *container_job_definition + extends: .container_job_template variables: NAME: fedora-win64-cross =20 amd64-ubuntu1804-container: - <<: *container_job_definition + extends: .container_job_template variables: NAME: ubuntu1804 =20 amd64-ubuntu2004-container: - <<: *container_job_definition + extends: .container_job_template variables: NAME: ubuntu2004 =20 amd64-ubuntu-container: - <<: *container_job_definition + extends: .container_job_template variables: NAME: ubuntu =20 amd64-opensuse-leap-container: - <<: *container_job_definition + extends: .container_job_template variables: NAME: opensuse-leap --=20 2.26.3