From patchwork Sun Apr 18 23:34:42 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 12210527 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id D98D1C433ED for ; Sun, 18 Apr 2021 23:37:49 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 80DA960FDA for ; Sun, 18 Apr 2021 23:37:49 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 80DA960FDA Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=amsat.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:48482 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lYGz6-0002uU-N4 for qemu-devel@archiver.kernel.org; Sun, 18 Apr 2021 19:37:48 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44452) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lYGx0-00019x-Th for qemu-devel@nongnu.org; Sun, 18 Apr 2021 19:35:38 -0400 Received: from mail-wr1-x434.google.com ([2a00:1450:4864:20::434]:40648) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lYGwz-0003JE-D6 for qemu-devel@nongnu.org; Sun, 18 Apr 2021 19:35:38 -0400 Received: by mail-wr1-x434.google.com with SMTP id e5so3431766wrg.7 for ; Sun, 18 Apr 2021 16:35:36 -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=akfd4zNPJdM6LFbIocvWsd+KsofcFC+HThy+qBvSafuSo1rkYIRLQfi8DS7AlRyT2/ A+l1odmVBNJ9aq9ENg140kRDbu5P19+WGCZW+4DUNUlMEMqSksL0y2FCPBxD07kCodo0 b5/OdZJtwCVefAYskZDCt+Q5jMr4B2OVuJoMtuKYLXRstWltzvkxoY97J4Rut96V9Kh0 5lTrHxXyEpjcSCdopjKIgWmo+kWQh35RZtrqXCOGst5eFqbx75aSXMFN4cEzEAxV/J56 SwKPgveSqZVm1waUXRLatjIUaOKTwRtaFs5Fyotdxmtyy6Fx8/IzPzefosW1lZGz6Xn1 EWow== X-Gm-Message-State: AOAM533n+NmsO2SJovdLbFvABhnHwxcEJhFEomkaaTLdIFbiHxNzrTIJ JxJqUh2qp8aZDzAKeXB0R4hH1bC/HizxKQ== 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) 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) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org 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 Received-SPF: pass client-ip=2a00:1450:4864:20::434; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-x434.google.com X-Spam_score_int: -14 X-Spam_score: -1.5 X-Spam_bar: - X-Spam_report: (-1.5 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.249, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.249, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Thomas Huth , =?utf-8?q?Daniel_P_=2E_Berrang=C3=A9?= , Erik Skultety , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Wainer dos Santos Moschetta , Willian Rampazzo , Cleber Rosa , Miroslav Rezanina , =?utf-8?q?Alex_Benn=C3=A9e?= Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" 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é --- .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'