From nobody Tue Feb 10 08:03:51 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.128.43 as permitted sender) client-ip=209.85.128.43; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-f43.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.43 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com; dmarc=fail(p=none dis=none) header.from=amsat.org ARC-Seal: i=1; a=rsa-sha256; t=1622063966; cv=none; d=zohomail.com; s=zohoarc; b=kbzRict2JspATKYg74sPtoa3xFQk2GJgo512wUHE1Q31E3wUoWUfL2f/Nic9N5y9LjL3T0TSODd4n+DaDBwjfFD/gv9VAxNCy3H59gwHBHQUG4tFRj2gDSCLd3xa51pjYZtjnifgUpZH6reQM3mtaB/1J5XfuxWFeUW9M/OwJg4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1622063966; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=TAWBCS/jkXxoAg50yEeoy5C+3FJkTgMoTfO907Q+3r4=; b=NaIzNjiKCvK2pADpV9CTgdeeHJ1ONV2Rj7mJ/swqcBC2F/5RxgpBmxyfdIA9Au0b0b5xg4/yX+lVrCROU9UG7vpqDk897trp+Dd2U/v7foWYmjWXxVLn29E7AIwgKi+UGJx5tgCaFKJmHudr+Yayc3VEeYvcf/9Uo9B2hqfRl1Y= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.43 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com; dmarc=fail header.from= (p=none dis=none) header.from= Received: from mail-wm1-f43.google.com (mail-wm1-f43.google.com [209.85.128.43]) by mx.zohomail.com with SMTPS id 1622063966466359.6951716014927; Wed, 26 May 2021 14:19:26 -0700 (PDT) Received: by mail-wm1-f43.google.com with SMTP id s5-20020a7bc0c50000b0290147d0c21c51so1292992wmh.4 for ; Wed, 26 May 2021 14:19:25 -0700 (PDT) Return-Path: Return-Path: Received: from localhost.localdomain (235.red-83-57-168.dynamicip.rima-tde.net. [83.57.168.235]) by smtp.gmail.com with ESMTPSA id b10sm223996wrr.27.2021.05.26.14.19.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 26 May 2021 14:19:24 -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=TAWBCS/jkXxoAg50yEeoy5C+3FJkTgMoTfO907Q+3r4=; b=Q5umiYmJ2P/wCv3jb03ITY2RHucDhmpy4iaMWkzQJvhlsXFcWr9i/1Oa9cXtNzpZ9b /1E8rV2DVZ4rKW84VNLzbrEL/HxwAsscWo5lyga7JmeHJBh7Hdz9FG6WzfZh95xJxv4p 79SBWLVsrW/QlTX9zbS118Adz+YI4LUPMbeUVcQKxDcnvl1hRyokcyiRmIlsODAkEVgc iY9psvRQgpbwC1TOZCvGyij5fXN6OcMQJ0V2tTQpoI1uhPjXGMIgiTMYFk6Rf5765XeB iCyzRx8ecs3UfqyCOlstf08qw0Ns91SuK3qZYoNNq5kG24UZqRjcGI22YyeIiFCPki5/ 002Q== 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=TAWBCS/jkXxoAg50yEeoy5C+3FJkTgMoTfO907Q+3r4=; b=Dl3fp9hnMhxP2gMgEjAe+ImQgpxjGofIxArW80V6dgP4Xzeh41/WuTyPBVhZAi340m 3LrboGbISzmk/4pA73KToGXtApJ6nHkuXS3i58wOv06jAVDfCF951xpsFtVW+DKiyMG+ 48BUvYHYvE3+0EzBoAjlBQPz8HgknG9ytWtnY1HJDjCum+dN8uaEs/Dc+2WDwEO+iUiU c8iz7nITBtxM0Xsf0qZsCMkZzlqZ3VhiNVUOlEPwFi2RQBGNr6tWabuEtt5GiT9YFzno 9I4dBJRq5d3jbQM6b5NdRWs+Mk7TtcX+9z7OGTmDFovTkDmyR+GusT5+frcDJHoJLEkN 930A== X-Gm-Message-State: AOAM530K4RBP9VOo9wk+PqdQJkx10nCl7+27hexASj9rnBAyRE/fKvmL 7WcQuXBoXbLnN9hPZIez4PA= X-Google-Smtp-Source: ABdhPJytiYB6nmIqjxob5ku3XqTdM1sdM4jsqnigSishO04XmchVinKPZYybgWMCDy/NsS6unhVWfg== X-Received: by 2002:a1c:3183:: with SMTP id x125mr5281926wmx.80.1622063964663; Wed, 26 May 2021 14:19:24 -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: Thomas Huth , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Willian Rampazzo , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Wainer dos Santos Moschetta Subject: [PULL 09/19] gitlab: Extract core container jobs to container-core.yml Date: Wed, 26 May 2021 23:18:28 +0200 Message-Id: <20210526211838.421716-10-f4bug@amsat.org> X-Mailer: git-send-email 2.26.3 In-Reply-To: <20210526211838.421716-1-f4bug@amsat.org> References: <20210526211838.421716-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) It is not possible to use the previously extracted templates without this set of core containers. Extract them into a new file (container-core.yml) to be able to build them without having to build all the other containers by default. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Thomas Huth Reviewed-by: Willian Rampazzo Message-Id: <20210519185504.2198573-10-f4bug@amsat.org> Signed-off-by: Thomas Huth --- .gitlab-ci.d/container-core.yml | 17 +++++++++++++++++ .gitlab-ci.d/containers.yml | 17 +---------------- 2 files changed, 18 insertions(+), 16 deletions(-) create mode 100644 .gitlab-ci.d/container-core.yml diff --git a/.gitlab-ci.d/container-core.yml b/.gitlab-ci.d/container-core.= yml new file mode 100644 index 00000000000..e8dd1f476a2 --- /dev/null +++ b/.gitlab-ci.d/container-core.yml @@ -0,0 +1,17 @@ +include: + - local: '/.gitlab-ci.d/container-template.yml' + +amd64-centos8-container: + extends: .container_job_template + variables: + NAME: centos8 + +amd64-fedora-container: + extends: .container_job_template + variables: + NAME: fedora + +amd64-debian10-container: + extends: .container_job_template + variables: + NAME: debian10 diff --git a/.gitlab-ci.d/containers.yml b/.gitlab-ci.d/containers.yml index 2b06763d73b..0acc8381ac1 100644 --- a/.gitlab-ci.d/containers.yml +++ b/.gitlab-ci.d/containers.yml @@ -1,5 +1,5 @@ include: - - local: '/.gitlab-ci.d/container-template.yml' + - local: '/.gitlab-ci.d/container-core.yml' =20 amd64-alpine-container: extends: .container_job_template @@ -11,16 +11,6 @@ amd64-centos7-container: variables: NAME: centos7 =20 -amd64-centos8-container: - extends: .container_job_template - variables: - NAME: centos8 - -amd64-debian10-container: - extends: .container_job_template - variables: - NAME: debian10 - amd64-debian11-container: extends: .container_job_template variables: @@ -211,11 +201,6 @@ cris-fedora-cross-container: variables: NAME: fedora-cris-cross =20 -amd64-fedora-container: - extends: .container_job_template - variables: - NAME: fedora - i386-fedora-cross-container: extends: .container_job_template variables: --=20 2.26.3