From patchwork Tue Jul 7 07:08:35 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: 234921 Delivered-To: patch@linaro.org Received: by 2002:a92:d244:0:0:0:0:0 with SMTP id v4csp655576ilg; Tue, 7 Jul 2020 00:15:38 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyMKaSqIOKGNSwBG6JQqtzrvKK+BKuII8fIffOnP2b5cHgN5UU42/PPcxKD6WEqEZLFK/qv X-Received: by 2002:a25:2d43:: with SMTP id s3mr634330ybe.341.1594106138463; Tue, 07 Jul 2020 00:15:38 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1594106138; cv=none; d=google.com; s=arc-20160816; b=H0k+6gE3VQzquL9J3g4CbEbgsZFmDiy0GmI3PskOYWBsrqrHeSATPnCwNWtVOV1hsT +eVptD5DGNcFVmu7SHuaVeUmzWgY6kfIaQoJgU6Ejpjc1jPS24+mBm+mYMHVnNExgxrw 0u0dIBB9deI/wVbJH0OZnarsFre5zUuG26yMwLCkQUUYYmkQ8GpD0vMFqc3nTFedRi+2 ZBY2hEv7Eb8tiLAnmVO2Op4hR2Z9aDvR+CC1AIPUhKyUF32mnDDCcyEJTCZbttvd2ZEG wtiSnfAuv25ipBpZ+cgBrdlpfl+atE1+6AWgyXf9fTWU7CDrMuJBRM/+l8Zsz3AxItxK aeqw== 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=eqzXTFvwpMkciPOZ24DlL9wg1TWlgnxheOGFm1m1Zko=; b=fa7ibXc7QbRksoqBvMDDbYE2drgvvKt91r0PUwSzGNA8b0rw0/3xy/xtM43hX3bZB5 /Sm0CMCDIyVxEM5ROm1lqGeNuEP5U33ZWBEwtY0hXleICARVdDiMqqY8kVgQKgCtU5hI 4RPMVShMHbVeNBUsz3d+QCQhOA/3cy+hAzdlyrTKqr0gUBefk9xEca5U4fBwrKN5Xtos LHjwxvFGaxkmQOBvfEdiPZatLY/RariMmYP4XwfCQKgiS2cbdERl02OWOAiAaaidAywS soXI5sK2itZpXZ3Ljxk6Wzyul8x8WFLQhyYLe1jU6eaKjxkmC5VNME+l2/s4dmG+xNlG qUdQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b="FW6u/FcT"; 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 k128si21996537ybk.28.2020.07.07.00.15.38 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 07 Jul 2020 00:15:38 -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="FW6u/FcT"; 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]:60792 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jshpJ-000719-U8 for patch@linaro.org; Tue, 07 Jul 2020 03:15:37 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:43576) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jshoE-0006aF-VC for qemu-devel@nongnu.org; Tue, 07 Jul 2020 03:14:31 -0400 Received: from mail-wm1-x32a.google.com ([2a00:1450:4864:20::32a]:39654) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jshoC-0004qf-Vo for qemu-devel@nongnu.org; Tue, 07 Jul 2020 03:14:30 -0400 Received: by mail-wm1-x32a.google.com with SMTP id w3so32866572wmi.4 for ; Tue, 07 Jul 2020 00:14:28 -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=eqzXTFvwpMkciPOZ24DlL9wg1TWlgnxheOGFm1m1Zko=; b=FW6u/FcTipVkdqSZzFZKAq9AnznjWuqqoIrSafqtjxsj1J0rHKVIa0E55mwky604zW Ehj0sDxmJkhJs3y5APTC6QRdPKd8EyolXmHZv/7eGLK0bikJRZOdd9qg8nvFgM+BjmuY 5NuS1SDF78imxtF3Ma+DpEydTsfJYLzOmY64iFhWyjjL2GLsAVs/w+t/KBpUTCq8lZmW cIeRFRUWzw3JgVHf95n/kyCIRfGpr0kZpO+B1FX6HJovMs+OyAI7aWEYCk7GlmmBnbEf YR8XdK3bR0YXY9CPZg/rx07Iy+ysAIu4imJbmKnPmnoDOCuZG5mAGaKPNR7pwE9hV2JK 3m/A== 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=eqzXTFvwpMkciPOZ24DlL9wg1TWlgnxheOGFm1m1Zko=; b=DYTVDrGXETJatmFyAMTDl7M+gLMLU2iu5Kzee3wsWWpwhQcJFPOVi7IJigoKDotuP+ 0+oogvbDzBtxPwsglRp0z8fWbycnmbCzOb4yRbE36KAsKJj42Oc89CBz+8HCBo1DRlmv 7XkQbjGGCvgcJt+33s+oCH9yKq+M3KUnTe/F7RD/xWVVP+jhcAfVqfQkVs+le0LZ1tuR ZsaXSrlisHfc7pZsBIMKNurf4YVxzTBov94toZNxM6k5c85Q8zFyXAqyiLWA4gcl64sU OSwiram/3MLgCm0Ht5nQshvOIJweC/x02X0nAMPFpM7iqp8xDbi5bv3rcxYGUYC3QxGe w/Dg== X-Gm-Message-State: AOAM532vpF0urCwXpGwPcQg2doLf/dAoFfp1nZKBeK9QdM1FLJEXP8ds L72hlSqGut0Eqjlt9bBcP8/Mpg== X-Received: by 2002:a1c:5986:: with SMTP id n128mr2529967wmb.112.1594106067389; Tue, 07 Jul 2020 00:14:27 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id j16sm27183653wrt.7.2020.07.07.00.14.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 07 Jul 2020 00:14:22 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 6342A1FFA6; Tue, 7 Jul 2020 08:09:00 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Subject: [PULL 18/41] gitlab: introduce explicit "container" and "build" stages Date: Tue, 7 Jul 2020 08:08:35 +0100 Message-Id: <20200707070858.6622-19-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200707070858.6622-1-alex.bennee@linaro.org> References: <20200707070858.6622-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32a; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x32a.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: Thomas Huth , =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , Laszlo Ersek , qemu-devel@nongnu.org, Wainer dos Santos Moschetta , =?utf-8?q?Philippe?= =?utf-8?q?_Mathieu-Daud=C3=A9?= , =?utf-8?q?Alex_Benn=C3=A9e?= 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> Message-Id: <20200701135652.1366-21-alex.bennee@linaro.org> -- 2.20.1 diff --git a/.gitlab-ci.d/edk2.yml b/.gitlab-ci.d/edk2.yml index a9990b71475f..e1e045241661 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 6a1750784ac1..62088ec5ec1b 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 349c77aa580e..9fdc752ea636 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: