From nobody Wed Nov 19 22:24:11 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.47 as permitted sender) client-ip=209.85.221.47; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f47.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.47 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1618788937; cv=none; d=zohomail.com; s=zohoarc; b=cq84e4HZciNwE41YbTSDIshDVC4CStTGDrG8xp1X4hfst/mx3n8Zpkfb12O8PS4sSaFZ0MKFn5lVDF2qspVsbVeHn2kq57bEE8b1zcMYxB0IJogn0mS0RMkkUDlLHt01MY5p1lwWRXJ75dQF4+FGtTCgPdOscXgrR1dHvP6zGIc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1618788937; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=ub4Z4KuEsuOp57bzjB7PNdaoI3pNBoAGYQv//w2NMwY=; b=ThdwBYNNibuXAqnw2b8jYfEv9S7roxmM53qTEvCK9AGIWmB/LOP39rKtJK6FhQm4MkUMqukomsi+1fGz93ypNpFMSC1z8kUIyAm2OtgTUzRxhY2AMm81xH/jHN9hQB9dcDE2W45Gwhv9tNXHkGQmSyp7ZDbrkYAszm+jaWgU0Fc= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.47 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wr1-f47.google.com (mail-wr1-f47.google.com [209.85.221.47]) by mx.zohomail.com with SMTPS id 1618788937523586.1189517472337; Sun, 18 Apr 2021 16:35:37 -0700 (PDT) Received: by mail-wr1-f47.google.com with SMTP id r7so20078257wrm.1 for ; Sun, 18 Apr 2021 16:35:36 -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 p17sm16851681wmq.47.2021.04.18.16.35.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 18 Apr 2021 16:35:35 -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=ub4Z4KuEsuOp57bzjB7PNdaoI3pNBoAGYQv//w2NMwY=; b=iNeXxebXFZDbNhLOAbwVbyVoIeT1MWUuN2X3mQqvoxbgjf9CSrUJZl/isPdjAwD6Nb ehKxmKPZ4TEZGDhkNWG6KuTY+k0YOOVYOsmFmWfwIiYkQ/ETK5XSz/a1/gVKbXbn0TQw JtUBJEFMDOc7j9qpA+CY7tNSCLuF38r4KIa+4qx0Iq/DzbaNiVOY3TAHfvrUQ7S291ZY NfwBoHR6iA1D4Irmq7OjCvVr4yM+yp1u0CdSKoamYH1sQrutjEow2fAo6ACGZoCW8IUY lTEmBQ08rb+lsxMGGyxIAHOQ8FhOsPhS5qanSsBRs3AbkiMNGvXcKQM7XGaq527vWUki j1TQ== 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=ub4Z4KuEsuOp57bzjB7PNdaoI3pNBoAGYQv//w2NMwY=; b=ubLG6e5rA6T5ZBqcU6www3i59xX+k/Vip9EjGFpffV+aBHHz9BrJedQXJwL+6Mz+Lp zxO9jQ78sQZPlabhly6gavd6NsiUFxDi38tIrwutouqDTIPOxwjuIyTR+fubn3Gjkf+O HNte5K/ULwdUsgX6JDV56TVw/OifrU/omXAnXQCUojl8STtcgbDG+nwT8XjjpjP2otii 5IqsVjwmzf1uHgUTLDbbLeRUSUE93cma7te6kGQ3EclGrj2AYUVVRfRIsz5Duv34iuXx hGGxHkiiMtYn6kRktDv3Or7NoGVApztk3crIKSKr8pF5LEZzEVpGbieV4Hi1t55nThUW nqkA== X-Gm-Message-State: AOAM531jLSoa4EY1RKdHU+zpjOf5opakWGPXx23YxjxVnG1ifbAIW/AB IhzS7uixXWJS2B8mxyT0qnM= X-Google-Smtp-Source: ABdhPJyt8tZ7RzLX1OglFDMKOCkUTlmK22B45ni7TAKx7cc5JA8/Ajv9f9BkINuqBZGHHGoMVj0cVA== X-Received: by 2002:adf:e901:: with SMTP id f1mr10686915wrm.44.1618788935828; Sun, 18 Apr 2021 16:35:35 -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 09/15] gitlab-ci: Extract build stages to stages.yml Date: Mon, 19 Apr 2021 01:34:42 +0200 Message-Id: <20210418233448.1267991-10-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) Extract the build stages used by our job templates to a new file (stages.yml) to be able to include it with the other templates, without having to run all the jobs included in the default .gitlab-ci.yml, which are mainly useful for mainstream CI. Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- .gitlab-ci.d/stages.yml | 8 ++++++++ .gitlab-ci.yml | 10 +--------- 2 files changed, 9 insertions(+), 9 deletions(-) create mode 100644 .gitlab-ci.d/stages.yml diff --git a/.gitlab-ci.d/stages.yml b/.gitlab-ci.d/stages.yml new file mode 100644 index 00000000000..f50826018df --- /dev/null +++ b/.gitlab-ci.d/stages.yml @@ -0,0 +1,8 @@ +# Currently we have two build stages after our containers are built: +# - build (for traditional build and test or first stage build) +# - test (for test stages, using build artefacts from a build stage) +stages: + - containers + - containers-layer2 + - build + - test diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ba35b3917e7..c367d42977c 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,13 +1,5 @@ -# Currently we have two build stages after our containers are built: -# - build (for traditional build and test or first stage build) -# - test (for test stages, using build artefacts from a build stage) -stages: - - containers - - containers-layer2 - - build - - test - include: + - local: '/.gitlab-ci.d/stages.yml' - local: '/.gitlab-ci.d/edk2.yml' - local: '/.gitlab-ci.d/opensbi.yml' - local: '/.gitlab-ci.d/containers.yml' --=20 2.26.3