From patchwork Wed Jul 1 13:56:32 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 192148 Delivered-To: patch@linaro.org Received: by 2002:a92:d244:0:0:0:0:0 with SMTP id v4csp525585ilg; Wed, 1 Jul 2020 07:05:51 -0700 (PDT) X-Google-Smtp-Source: ABdhPJws96RKD2b40stNFsJKoKfsMjKPwYrCGqdTDlF59yuW+vhNx1SGuAQN5nRDV/AbVx5/quQ1 X-Received: by 2002:a5b:282:: with SMTP id x2mr41845927ybl.304.1593612351292; Wed, 01 Jul 2020 07:05:51 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1593612351; cv=none; d=google.com; s=arc-20160816; b=eN9H/DdfY80XnAnPTF4I9kz+B6CVHCje6UF2upCS+NN1V6TDLhJVhw7RBN4czyRZ6D KKMi9zJItSICz7a5eYWAPTYpnjfI3pAnTrIDWuN2Vd/m0eroal0Bz5fSAq/EYHHWhDij HCgRT/UWvR38la3xFZGeB+Vzs1OVeUDSLUG3P6fj50FN08YTGrveJAhT5TGBtsDeQd6q UJy9XER0n6jHUUtK81AJMwqOeJkv4qDTw0nwUuMcN/VAWhrYap0h3dwdeAjCz2T2eP68 eBP+/XHDVmz9Im7pj6BFKi6l0vrmq4PYij1667r7wxJMx5fYn9T264FbYjPn2lbSmSMF ddmg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=BoQbWA8pgX9GC2xijlmIAV/4o0rgmcM2g2psEePuq2U=; b=TkrHXgUmj/4IRZRo7iPRP1v/yDsAmrI6FbNuhAdCuoVR3APP64srvLQTRC6zDqPO10 2eJrAO/VXOm4Qd8c468aZMFFphPBcwStvu3wxn2Hp8nBfv+67UF0Ijg3ehenThEFqG1+ /DyoFFPG+hIdspmwyauJZ0+2B47+5Yl+OzDUIgk2YHw1m5gCmFRVfMsbfnEuqCoW5DLK 49xsSxVpxCGfPo0aVqIHpk2uIHRW/+uK4RRJVFErGEM4llbYobMnhx3HrI40GxOv6Xmd mlMTlW/HAyegwmh773YWC4KeG2CXrfHztW8s+me9LsszG53nSVq0WrExrCnYsSC0GgLR vuVw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=F2tvzyJx; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id v137si5567380ybv.363.2020.07.01.07.05.51 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 01 Jul 2020 07:05:51 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=F2tvzyJx; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:60550 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jqdN0-0008NW-Ll for patch@linaro.org; Wed, 01 Jul 2020 10:05:50 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:59084) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jqdEl-0002aL-HX for qemu-devel@nongnu.org; Wed, 01 Jul 2020 09:57:22 -0400 Received: from mail-wr1-x429.google.com ([2a00:1450:4864:20::429]:33982) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jqdEh-0005tK-Cm for qemu-devel@nongnu.org; Wed, 01 Jul 2020 09:57:19 -0400 Received: by mail-wr1-x429.google.com with SMTP id f7so20948049wrw.1 for ; Wed, 01 Jul 2020 06:57:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=BoQbWA8pgX9GC2xijlmIAV/4o0rgmcM2g2psEePuq2U=; b=F2tvzyJxzTOX8RooDOMbR6ll3Sok+dGHUyuqXmS+rFb56WUlYQsvmM/MvY835znBIu TOoUomkchoLwwO8bYwigwd+fm4GgDKD5ULawWnlOcda7Le4VADRc2Nw51zg9m9OAeVg3 bv1bBfZ/nVduT/eYFq8EFPcKxGV3iCjIiKlkov1/eUccBcyZL0rxYBED9DHPYgVrkRnn n8v+mffyQUyLthAkEs/U1dreM/JmiUYWihAEs7CiKjo7ZcfHZm4IbrfjKnKM0XqX7JjK D2jilt9Ox8lkzFtdCxEDCbBqzG3x0yeTimAK4i+tJKsABP3yEZnz4/ri8Y4PbDeVsGjp ssNw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=BoQbWA8pgX9GC2xijlmIAV/4o0rgmcM2g2psEePuq2U=; b=p5CnmqH7PRTuvBqW/R6j8wk7zm7EU+BsbJKEbMQoe8brSUldnEEDECFHhcaY64UQeM C4tQkNS70ADHgEYEzQrapLZhxoPyOrLy1JURNul0KjfmwIybOrtgyuCwMkDxf22yeG9+ 3Bfh84o0kpQCy+LPqJ77G7pd48CN4jVbuiUs75xBfFuFc3I37Z+/PoFO/90+UalyaN+d RypnkmrTc8TBMgNI3Kn+kKUuZjHykCBWG2usAD7DUvsq1XnIbz2vkBqGBZpuQoPhJ/2n wruyZ2DGLqbBdBsGaoxIU3uiXBTxMwaxt9F3eagTfxF1fCoHXBXqcukDOxkbtqA1L2lD 3qSg== X-Gm-Message-State: AOAM532196ZhmoKaxipH2dN3lC5EOuowXfSqE3y1D/S4/4h2L8fGqP67 b3wli2zGo7KMCpU8G5AOlQPNMQ== X-Received: by 2002:adf:de0a:: with SMTP id b10mr26277109wrm.72.1593611834037; Wed, 01 Jul 2020 06:57:14 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id l18sm7652562wrm.52.2020.07.01.06.57.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 01 Jul 2020 06:57:02 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 0044E1FF7E; Wed, 1 Jul 2020 14:56:55 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v4 20/40] gitlab: introduce explicit "container" and "build" stages Date: Wed, 1 Jul 2020 14:56:32 +0100 Message-Id: <20200701135652.1366-21-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200701135652.1366-1-alex.bennee@linaro.org> References: <20200701135652.1366-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::429; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x429.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=_AUTOLEARN 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: fam@euphon.net, Thomas Huth , berrange@redhat.com, Laszlo Ersek , richard.henderson@linaro.org, f4bug@amsat.org, Wainer dos Santos Moschetta , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , =?utf-8?q?Alex_Benn=C3=A9e?= , cota@braap.org, aurelien@aurel32.net Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Daniel P. Berrangé If no stage is listed, jobs get put in an implicit "test" stage. Some jobs which create container images to be used by later stages are currently listed as in a "build" stages. Signed-off-by: Daniel P. Berrangé Acked-by: Laszlo Ersek Signed-off-by: Alex Bennée Reviewed-by: Thomas Huth Reviewed-by: Philippe Mathieu-Daudé Message-Id: <20200622153318.751107-2-berrange@redhat.com> --- .gitlab-ci.d/edk2.yml | 3 ++- .gitlab-ci.d/opensbi.yml | 3 ++- .gitlab-ci.yml | 11 +++++++++++ 3 files changed, 15 insertions(+), 2 deletions(-) -- 2.20.1 diff --git a/.gitlab-ci.d/edk2.yml b/.gitlab-ci.d/edk2.yml index a9990b71475..e1e04524166 100644 --- a/.gitlab-ci.d/edk2.yml +++ b/.gitlab-ci.d/edk2.yml @@ -1,5 +1,5 @@ docker-edk2: - stage: build + stage: containers rules: # Only run this job when the Dockerfile is modified - changes: - .gitlab-ci.d/edk2.yml @@ -24,6 +24,7 @@ docker-edk2: - docker push $IMAGE_TAG build-edk2: + stage: build rules: # Only run this job when ... - changes: # ... roms/edk2/ is modified (submodule updated) - roms/edk2/* diff --git a/.gitlab-ci.d/opensbi.yml b/.gitlab-ci.d/opensbi.yml index 6a1750784ac..62088ec5ec1 100644 --- a/.gitlab-ci.d/opensbi.yml +++ b/.gitlab-ci.d/opensbi.yml @@ -1,5 +1,5 @@ docker-opensbi: - stage: build + stage: containers rules: # Only run this job when the Dockerfile is modified - changes: - .gitlab-ci.d/opensbi.yml @@ -24,6 +24,7 @@ docker-opensbi: - docker push $IMAGE_TAG build-opensbi: + stage: build rules: # Only run this job when ... - changes: # ... roms/opensbi/ is modified (submodule updated) - roms/opensbi/* diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 349c77aa580..9fdc752ea63 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,3 +1,7 @@ +stages: + - containers + - build + include: - local: '/.gitlab-ci.d/edk2.yml' - local: '/.gitlab-ci.d/opensbi.yml' @@ -17,6 +21,7 @@ include: - JOBS=$(expr $(nproc) + 1) build-system1: + stage: build image: ubuntu:19.10 <<: *before_script_apt script: @@ -31,6 +36,7 @@ build-system1: - make -j"$JOBS" check build-system2: + stage: build image: fedora:latest <<: *before_script_dnf script: @@ -46,6 +52,7 @@ build-system2: - make -j"$JOBS" check build-disabled: + stage: build image: fedora:latest <<: *before_script_dnf script: @@ -62,6 +69,7 @@ build-disabled: - make -j"$JOBS" check-qtest SPEED=slow build-tcg-disabled: + stage: build image: centos:8 <<: *before_script_dnf script: @@ -82,6 +90,7 @@ build-tcg-disabled: 260 261 262 263 264 270 272 273 277 279 build-user: + stage: build <<: *before_script_apt script: - mkdir build @@ -92,6 +101,7 @@ build-user: - make run-tcg-tests-i386-linux-user run-tcg-tests-x86_64-linux-user build-clang: + stage: build image: fedora:latest <<: *before_script_dnf script: @@ -106,6 +116,7 @@ build-clang: - make -j"$JOBS" check build-tci: + stage: build image: centos:8 <<: *before_script_dnf script: