From patchwork Tue Feb 28 19:06:35 2023 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: 657480 Delivered-To: patch@linaro.org Received: by 2002:adf:a3c6:0:0:0:0:0 with SMTP id m6csp3097426wrb; Tue, 28 Feb 2023 11:09:33 -0800 (PST) X-Google-Smtp-Source: AK7set8Uh1QvVBQT74uZtFOOTLi5v6x267uP6mUOXUSHkU72wYFGvDnVd/Q4cm2pcuDUbXDnfgdo X-Received: by 2002:a05:6214:2388:b0:56e:a899:1614 with SMTP id fw8-20020a056214238800b0056ea8991614mr7227622qvb.0.1677611373375; Tue, 28 Feb 2023 11:09:33 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1677611373; cv=none; d=google.com; s=arc-20160816; b=GwkrjfmumE5BInNMjOX2L2d36uIB1WJlZnp319cvte9PWcSa6y4tL4C6GT7MOREpIa WG845Rd/n24JTF1l7Os9u3FMBe84Em56OUjMaSGHyP88zS7OrzsvDywtZOz1EGpclnhq uZl5J8t+9+fH84006ld7APpYwo/AS3Oc/T4IQzK+L3I6lFPqZ6uMgCyRVHjOcrwKNdI0 tgs9ImbEUT/jTr1j64gb7sXLUbFkLGurtCTPs5wiUr4fST5UO0qrNLig3dfkf3xPXd2e ud525junCcpaoRBJYgmZct+pihg01fC2EMuiOEeRUs1FQOshd8TCcs5YeOfhLikzhD94 6njQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to: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:cc:to :from:dkim-signature; bh=21sp0hozNqE2G/F3Ib4OoUY82nDzhwO791FLVQWUI0Y=; b=NNWF+xf/U+1Zz8dhSBvsJh5nQq3FXn9wSohpgm02orcGH1EEWryIGwbXnCkM4CbMfw MDhjYvd+rcrQaGcJH4C2XPavrCdD5Jv4yZv1sbOewH6nKh7mXc8SD7zt0cJQIkhzTD/J 21MON0exGrJe5L30+l4LhBBg4uBeldOjR1T57Gq06yCFGHPTsdkYbmhxzpYUW/mqTRLt dQy87Noi+p+VfLck5vdz27ZecvdQg3hwbnTtNdj0w2BovLqAo0llfc5dNmeZvFkzH/WZ 2Kr7X0GQZLJ53LI6/qVcMB+2QV61SboM+4d9NJOWS31wXTd/mj7dsMZqggDyhKCnEoOJ 5nZQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=k0u127K+; 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=pass (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 u4-20020a05620a430400b00742d6543ffdsi1711394qko.634.2023.02.28.11.09.33 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 28 Feb 2023 11:09:33 -0800 (PST) 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=pass header.i=@linaro.org header.s=google header.b=k0u127K+; 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=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pX5K3-0002Og-0D; Tue, 28 Feb 2023 14:07:35 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pX5Jk-0002JH-7i for qemu-devel@nongnu.org; Tue, 28 Feb 2023 14:07:18 -0500 Received: from mail-wr1-x42c.google.com ([2a00:1450:4864:20::42c]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pX5JT-0002ow-MV for qemu-devel@nongnu.org; Tue, 28 Feb 2023 14:07:06 -0500 Received: by mail-wr1-x42c.google.com with SMTP id bx12so7715393wrb.11 for ; Tue, 28 Feb 2023 11:06:59 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=21sp0hozNqE2G/F3Ib4OoUY82nDzhwO791FLVQWUI0Y=; b=k0u127K+0kfvMcv73QHpP9aIAxOwH/hP0h24oesYReBViSbaPYs7QW18rDhuF8opi0 GqQdh68zX82Mz85ZIMLVj03F9/6VkR1sYV+YTOFrNhXUd4LmySZUhDgG7M57q6ufxE69 53zlTcH+aVSGgKCV00wzy5f6M5rvt5HBzJ/HnJIpqCbRTbuE3YI7KVj/T5mykmSQNJgY MW/t+oBDM+e2oXcKqhZYJOR9q4VoABi8A9XOTc8cyCOeHyf2uX/VfYFToepjjIm6thQ0 6R8r7zQfGWfkYeGBaWgf2tTJXIMuEJN6Oc94bOQoChgKUahY08GMGlFdxM7LkxZlI+qy BXNw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=21sp0hozNqE2G/F3Ib4OoUY82nDzhwO791FLVQWUI0Y=; b=yX8sPvKdskta/TX4ZfiB6ZYIIhUFg9DN5kxQDPe4J2VE6+naoMzYd6W7cTDb2mdGDz ONp8lNaHquiY0QK41iKuLpNAJ69sR2iVIB/rgmVYXmOnJG/MK/gFIZATcpzBoJrhLckv vIFCFCGOa8M6YO4mudYoSGuAyskHbnHJwm1f2zCAia/Ns/VfiN81UiDk7Dr1aYNqu/7G PjrEd/E1fjMVINUvkdAPNn6oCyM0vlCMIupMe/0nrUp2thQkmdgy24nHsRsqbyW/afsT eLS12rxnQvEfyqcOQ5a6gXcRp/6wcEj/HpSgI8vKWFGbtOOl/MrGRYiMCstLkBqiq1NB Z5sg== X-Gm-Message-State: AO0yUKWWgKQHI9UFMZ4sQV7obM0DKIJJQF6QHw5vbFcyRdv+AhHrZPwe DORV0/Hu/pX+XkVxDddMGyO0Pw== X-Received: by 2002:a05:6000:38d:b0:2c5:5ee9:6b27 with SMTP id u13-20020a056000038d00b002c55ee96b27mr2816577wrf.13.1677611218055; Tue, 28 Feb 2023 11:06:58 -0800 (PST) Received: from zen.linaroharston ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id s2-20020adff802000000b002c706c754fesm10613655wrp.32.2023.02.28.11.06.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 28 Feb 2023 11:06:56 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id F34561FFBE; Tue, 28 Feb 2023 19:06:53 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , Michael Roth , Peter Maydell , Kevin Wolf , =?utf-8?q?Alex_Benn=C3=A9e?= , Beraldo Leal , Alexander Bulekov , Aurelien Jarno , Markus Armbruster , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Darren Kenny , Hanna Reitz , Cleber Rosa , John Snow , Ed Maste , qemu-arm@nongnu.org, Fam Zheng , Thomas Huth , Yonggang Luo , qemu-block@nongnu.org, Paolo Bonzini , Stefan Hajnoczi , Bandan Das , Li-Wen Hsu , Pavel Dovgalyuk , Laurent Vivier , Bastian Koppelmann , Qiuhao Li , Wainer dos Santos Moschetta Subject: [PATCH v3 06/24] gitlab: extend custom runners with base_job_template Date: Tue, 28 Feb 2023 19:06:35 +0000 Message-Id: <20230228190653.1602033-7-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230228190653.1602033-1-alex.bennee@linaro.org> References: <20230228190653.1602033-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::42c; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x42c.google.com 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=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org The base job template is responsible for controlling how we kick off testing on our various branches. Rename and extend the custom_runner_template so we can take advantage of all that control. Signed-off-by: Alex Bennée Reviewed-by: Thomas Huth Message-Id: <20230221094558.2864616-8-alex.bennee@linaro.org> --- .gitlab-ci.d/custom-runners.yml | 3 ++- .gitlab-ci.d/custom-runners/ubuntu-20.04-s390x.yml | 10 +++++----- .gitlab-ci.d/custom-runners/ubuntu-22.04-aarch32.yml | 2 +- .gitlab-ci.d/custom-runners/ubuntu-22.04-aarch64.yml | 10 +++++----- 4 files changed, 13 insertions(+), 12 deletions(-) diff --git a/.gitlab-ci.d/custom-runners.yml b/.gitlab-ci.d/custom-runners.yml index 9fdc476c48..34a1e6f327 100644 --- a/.gitlab-ci.d/custom-runners.yml +++ b/.gitlab-ci.d/custom-runners.yml @@ -15,7 +15,8 @@ variables: # All custom runners can extend this template to upload the testlog # data as an artifact and also feed the junit report -.custom_artifacts_template: +.custom_runner_template: + extends: .base_job_template artifacts: name: "$CI_JOB_NAME-$CI_COMMIT_REF_SLUG" expire_in: 7 days diff --git a/.gitlab-ci.d/custom-runners/ubuntu-20.04-s390x.yml b/.gitlab-ci.d/custom-runners/ubuntu-20.04-s390x.yml index f512eaeaa3..cdae6c5212 100644 --- a/.gitlab-ci.d/custom-runners/ubuntu-20.04-s390x.yml +++ b/.gitlab-ci.d/custom-runners/ubuntu-20.04-s390x.yml @@ -3,7 +3,7 @@ # "Install basic packages to build QEMU on Ubuntu 20.04/20.04" ubuntu-20.04-s390x-all-linux-static: - extends: .custom_artifacts_template + extends: .custom_runner_template needs: [] stage: build tags: @@ -24,7 +24,7 @@ ubuntu-20.04-s390x-all-linux-static: - make --output-sync -j`nproc` check ubuntu-20.04-s390x-all: - extends: .custom_artifacts_template + extends: .custom_runner_template needs: [] stage: build tags: @@ -43,7 +43,7 @@ ubuntu-20.04-s390x-all: - make --output-sync -j`nproc` check ubuntu-20.04-s390x-alldbg: - extends: .custom_artifacts_template + extends: .custom_runner_template needs: [] stage: build tags: @@ -66,7 +66,7 @@ ubuntu-20.04-s390x-alldbg: - make --output-sync -j`nproc` check ubuntu-20.04-s390x-clang: - extends: .custom_artifacts_template + extends: .custom_runner_template needs: [] stage: build tags: @@ -108,7 +108,7 @@ ubuntu-20.04-s390x-tci: - make --output-sync -j`nproc` ubuntu-20.04-s390x-notcg: - extends: .custom_artifacts_template + extends: .custom_runner_template needs: [] stage: build tags: diff --git a/.gitlab-ci.d/custom-runners/ubuntu-22.04-aarch32.yml b/.gitlab-ci.d/custom-runners/ubuntu-22.04-aarch32.yml index 42137aaf2a..50e5646a44 100644 --- a/.gitlab-ci.d/custom-runners/ubuntu-22.04-aarch32.yml +++ b/.gitlab-ci.d/custom-runners/ubuntu-22.04-aarch32.yml @@ -3,7 +3,7 @@ # "Install basic packages to build QEMU on Ubuntu 20.04" ubuntu-22.04-aarch32-all: - extends: .custom_artifacts_template + extends: .custom_runner_template needs: [] stage: build tags: diff --git a/.gitlab-ci.d/custom-runners/ubuntu-22.04-aarch64.yml b/.gitlab-ci.d/custom-runners/ubuntu-22.04-aarch64.yml index 8ba85be440..13e14a0f87 100644 --- a/.gitlab-ci.d/custom-runners/ubuntu-22.04-aarch64.yml +++ b/.gitlab-ci.d/custom-runners/ubuntu-22.04-aarch64.yml @@ -3,7 +3,7 @@ # "Install basic packages to build QEMU on Ubuntu 20.04" ubuntu-22.04-aarch64-all-linux-static: - extends: .custom_artifacts_template + extends: .custom_runner_template needs: [] stage: build tags: @@ -24,7 +24,7 @@ ubuntu-22.04-aarch64-all-linux-static: - make --output-sync -j`nproc --ignore=40` check ubuntu-22.04-aarch64-all: - extends: .custom_artifacts_template + extends: .custom_runner_template needs: [] stage: build tags: @@ -46,7 +46,7 @@ ubuntu-22.04-aarch64-all: - make --output-sync -j`nproc --ignore=40` check ubuntu-22.04-aarch64-alldbg: - extends: .custom_artifacts_template + extends: .custom_runner_template needs: [] stage: build tags: @@ -65,7 +65,7 @@ ubuntu-22.04-aarch64-alldbg: - make --output-sync -j`nproc --ignore=40` check ubuntu-22.04-aarch64-clang: - extends: .custom_artifacts_template + extends: .custom_runner_template needs: [] stage: build tags: @@ -107,7 +107,7 @@ ubuntu-22.04-aarch64-tci: - make --output-sync -j`nproc --ignore=40` ubuntu-22.04-aarch64-notcg: - extends: .custom_artifacts_template + extends: .custom_runner_template needs: [] stage: build tags: