From nobody Tue Feb 10 10:55:16 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.128.53 as permitted sender) client-ip=209.85.128.53; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-f53.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.53 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1621450538; cv=none; d=zohomail.com; s=zohoarc; b=bgw+5FBc+DjH6CPqkp9odCx9WO3uOKDArz1JDiWsJMYMjfALPGrz3eGEwvE4qAockwHWhO7c0GsLE71eal2hSeAGKMs3vJAJzxCcipcuCqNsHMQo3J6U8OlKN3jxhoVee0bkNrEJYrLqXnyVPtXdw3BOXmuUdo6YnxuPpT2wT3Q= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1621450538; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=h/Ig0v1yuZQWNoZm6vkO9AxQtQH1VqcNpoimhQNUuSQ=; b=hkBXsoM1tnjtOSbwfjONrlwMtHEY73EkDU3DQfH72HRvkjEVHhW76mBpZFWlI0666qo7KFj8hHoO62DO1Y9Ryr0J/EsIs99r2Z/heA5nGmEcRPnVe1u8PvCuwdJvGvvl4iHvuG+DjAeTvquR8O2FzCSo/bgoqGHs/UMIGX+Qzeo= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.53 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wm1-f53.google.com (mail-wm1-f53.google.com [209.85.128.53]) by mx.zohomail.com with SMTPS id 1621450538763202.17331935933362; Wed, 19 May 2021 11:55:38 -0700 (PDT) Received: by mail-wm1-f53.google.com with SMTP id h3-20020a05600c3503b0290176f13c7715so3869021wmq.5 for ; Wed, 19 May 2021 11:55:38 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.redhat.com (31.red-83-51-215.dynamicip.rima-tde.net. [83.51.215.31]) by smtp.gmail.com with ESMTPSA id t204sm7211656wmg.38.2021.05.19.11.55.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 19 May 2021 11:55: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=h/Ig0v1yuZQWNoZm6vkO9AxQtQH1VqcNpoimhQNUuSQ=; b=RgPnsHxaboWY8UujdPCoIWTYfg4Nud1MyqhVI/F+MXCIsq+e4EUtR+MxwQPZh0vJeU WMCJWwkZE6/tWHOhP8yeLozhP+v+VfZ/S06fX96epkbxfcNMDKWZHARHDc0qqoy+jH6h 2XMpT2zdQPediaZG5zAUU4j1wQKzgzrBgHZqZlY72Dsz9ySpNUd+OS7iE3J9w473MYed leKa2UVLShg5syhMuAsnDplDHt35QrAjU2TAo4RiPQIeNlr1jNVnz0g36eR4p1mWMQ0d ynay9yu0edeHsBU/UiKQPSAUZXOZaSBGwxZ1YacbqUmS6nwmEwKOBZ3n37ESGcwZD6Bp c8fA== 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=h/Ig0v1yuZQWNoZm6vkO9AxQtQH1VqcNpoimhQNUuSQ=; b=QTVxjDkoP43ZmLHMJ88s5B/TvNCB2llawWgiB7iOl7knEp1qA3f4nEpoGwSqFFnEDe 6++NiXPtQWRO5JkHL9xVrZ1/ZhD1PBwiYDxsay0ITnYNZusWXhCfi/zSu3Uu14m2r4HP 0D5u3jdJsy2QdLhuaJvOvGmL1ezPeZbjTQ5e0yRmD7VvjmlWF7YROVBbYI+P3Aa+yXbn eRsePe7kDwuvnXNqpLWDx96DxDMHTLJh9Tql2mtDwuO9RpnvMCx4cxCOme8ig1wZIboa 3664eOSk5e5xbxljJs0JPYh+fdrYqMmIFl7CzOAWZd5IOl+xRbywcRDDZtR0pEGsjOxa dVvg== X-Gm-Message-State: AOAM5338G2u/Vpm81TvH6TGBK/lkiJorFeuhOJrTuYgcFuFiWrPLRvNZ ybdX0jQB0QAmQE0Gr+45coE= X-Google-Smtp-Source: ABdhPJwZBjMZMf2IuE2kVoJu/Ka05CB8zfhHYMh1lNxLIlL1P00xq0q7Dv/FEgsJ58hFbsTqUGRT2g== X-Received: by 2002:a05:600c:2143:: with SMTP id v3mr605075wml.57.1621450537011; Wed, 19 May 2021 11:55:37 -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?Daniel=20P=20=2E=20Berrang=C3=A9?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Cleber Rosa , Wainer dos Santos Moschetta , Willian Rampazzo Subject: [PATCH v3 06/10] gitlab-ci: Extract build stages to stages.yml Date: Wed, 19 May 2021 20:55:00 +0200 Message-Id: <20210519185504.2198573-7-f4bug@amsat.org> X-Mailer: git-send-email 2.26.3 In-Reply-To: <20210519185504.2198573-1-f4bug@amsat.org> References: <20210519185504.2198573-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. Reviewed-by: Willian Rampazzo 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 bc7bad3d905..a348c101f6d 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