From nobody Wed Nov 19 22:21:11 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.128.45 as permitted sender) client-ip=209.85.128.45; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-f45.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.45 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1618788947; cv=none; d=zohomail.com; s=zohoarc; b=fMLHB+nbAHURhbwjzsPEr+2Llyf5ausNongDa0WO/Cx6xV8+Z5I6ECnW9HR44kJk6vAPOqH0A/ukHmmmLGLxprf59ReX3Oall5VYba6JJIs6WmsLina2+K4cNZ0a3iFcqa2vqjBb7PC5LgYF9ZOd2RUC+1Qbbni0ApmcodLThcc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1618788947; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=yp2oeeOnRwUm8R3KG/hR76rs8Lvxb/h3WI1buy5HvJU=; b=g7KzMFiN1K36HjKcX/lBLl9ns6klnpO8FB3nrRQgJzpmFspMdh+etJTj1Q4uMmMBE6DscGTL1aLGs+P+IvttPtDxc0Zpy5Cuf3l4V2GhbuUstn4v1Hnd2+QIdBaLl4UFGKvZSHhUmQM72obxOr6V14EC7mNzigtDZTjCHLVquQw= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.45 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wm1-f45.google.com (mail-wm1-f45.google.com [209.85.128.45]) by mx.zohomail.com with SMTPS id 161878894754844.73421598229095; Sun, 18 Apr 2021 16:35:47 -0700 (PDT) Received: by mail-wm1-f45.google.com with SMTP id i21-20020a05600c3555b029012eae2af5d4so7565721wmq.4 for ; Sun, 18 Apr 2021 16:35:46 -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 u2sm17125918wmc.22.2021.04.18.16.35.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 18 Apr 2021 16:35:45 -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=yp2oeeOnRwUm8R3KG/hR76rs8Lvxb/h3WI1buy5HvJU=; b=U+78c2EYUsMzGjb3E+3MhaMa3yt4ILdRRaQ0dVya5mDvPl3Zy3QY+YOW8XeCn0wdTR O2yp2HwAMlSi/tVlGGIUAI/fEfi0Ozfrzz0MkY3A4pKp8JH0fYnYh8NBcmD4QotFg2Mr qc7nDEq70oqpGXkvX842UtUTGlVxbq2RaGRNcJ3eZYyYbJ22Y+lcWVQIfRWpN44/h11z 5k9QuaMlpzSb7E8jqtJkjwgckQ3i6XqQK1tlDb2lJ0wyXNUGIfeBPLXjxOEzGEHBfJJl 1cWR5f6FjgfL8s0K/J58CihX66MH7ZJj6P9yJmNNRhbEYwo5iz2/zsI+StLWb0jRlk5G UPSg== 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=yp2oeeOnRwUm8R3KG/hR76rs8Lvxb/h3WI1buy5HvJU=; b=sg35e3Zc5kaCr62TmLh2PINPTMKNz9rROBwhr2+DRM2aqNtlhGAC2L1r5QTwZpZzhl Y4vsj8/vH8yuQZL/xjaXxP9VYaNjx+Wqe1CnuLVqYPO10MyAOdz0yQZJ9Xu/zqbaJ2y2 XOumR3aK0A/LVPbEWDfrc8xA2xjjrF7xhh3emh7lRKvsgRvTqYS9i5eC/DbUvWTnMvfr N5YZU+xnL21kC83ye5Bam/auIMk9Av6bLGj96zBCCM4OD1kSsa8G2dQeQC8ph9i4Yx+H dzxNi8xrrMhu0PO55i/dTX9vN8OGq5sEMH2eMD46sxxWkgD2YKSs9/UuXHOPvY9pjX5b n4dA== X-Gm-Message-State: AOAM532qsrB0LQegutl6hKikdkrxuffxHT0HtPDvcd4aPWld4bd9FW0/ rpmcGIDNaLhl+mvEkhG5Bo0= X-Google-Smtp-Source: ABdhPJy3RVVB/1dxfxTvvMSEejZQOujG0cGs+nu60tchcc6Zdvz3Zy5vbAA9S2z/SskKy88LvJNM9A== X-Received: by 2002:a7b:c1c5:: with SMTP id a5mr18461855wmj.54.1618788945878; Sun, 18 Apr 2021 16:35:45 -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 Subject: [PATCH 11/15] gitlab-ci: Extract core container jobs to container-core.yml Date: Mon, 19 Apr 2021 01:34:44 +0200 Message-Id: <20210418233448.1267991-12-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) 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 --- .gitlab-ci.d/container-core.yml | 17 +++++++++++++++++ .gitlab-ci.d/containers.yml | 16 +--------------- 2 files changed, 18 insertions(+), 15 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 0bf4899df10..c371f8587e1 100644 --- a/.gitlab-ci.d/containers.yml +++ b/.gitlab-ci.d/containers.yml @@ -1,5 +1,6 @@ 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 +12,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: @@ -190,11 +181,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