From patchwork Wed Mar 1 15:15:46 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: 657810 Delivered-To: patch@linaro.org Received: by 2002:adf:a3c6:0:0:0:0:0 with SMTP id m6csp3544469wrb; Wed, 1 Mar 2023 07:18:35 -0800 (PST) X-Google-Smtp-Source: AK7set8V6Ped3px4UBVWU+15lb7r/IqbOGJqbLqCV5FRbtxZL5WO9X8IdtDUQi81LwyHoY1Wfqv3 X-Received: by 2002:ad4:5745:0:b0:56e:ab31:199d with SMTP id q5-20020ad45745000000b0056eab31199dmr14409658qvx.40.1677683915381; Wed, 01 Mar 2023 07:18:35 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1677683915; cv=none; d=google.com; s=arc-20160816; b=PNRdmxD3UburPNorwZk+oQjYlj2YWgA9H9Yj/hQ6e/JkHEvugWR3vCei68qG6Dl+gS cbFuj+OHhxzsnZodKFbz8OtPCFbJ67qr6XS8kwW/CVKRIGfYUie6WgJFodwAEMrKfMwv yKWILcpOC5TV+wCDRODd7qAVzagR8+VkflEND07IU/zuMs3R6qS9GgaxEXhL98fYZRH4 JvJ+VNzE9wtTZ3f44r2M2Gaie7gzHmrpN/k5AgZWK50td6XFVz7zxbLGYStQXWiqSP9s bFr4xq3B4b5r4MZiIJ1DI2f4QJWawB+Ibm1zbBu1ABz0wzRxnqbPW2JxBe2aInd+S3m7 Oa+w== 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=070PzUrZfVxXqhDV3BT8grkHDt8Ezv1S71HCy6H1uh4=; b=qFyTJWm5gycyzt2mJEGhaEsT5jN6tgTPEFmwcoFXLzYoUIKVKYRYLITkiCBznuR08B mgmLg4DybWODtnnPfcxT1/X5yjXVubPNbEtBdwZLsUc7NW8Qqi7ZfLSxfpr0ur4NDqmL vTlHXG1t6JLTvKfsRGkHYZPFVIW3+0CqRuxFrcOAiRu0sMq5aDDd/HAHfjPJJLxmAYfm EvwROYcA5hI+ED7rEOO7zYzBLaECGr/8uCYViJlg/14Dt6k9OUYXQudutDwaVB+Fx7EL GT6/8kfciQieljxhZTnjY1NfuGJ+8Zwwy40Jhy/pRlR6QazMgcHOOcXZa2PRjQVvA9GG T6fQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=QvXBuH+k; 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 u14-20020a05620a454e00b0073b83b0eccbsi12140964qkp.296.2023.03.01.07.18.35 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 01 Mar 2023 07:18:35 -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=QvXBuH+k; 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 1pXOBp-0008Gm-47; Wed, 01 Mar 2023 10:16:21 -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 1pXOBj-00089I-2N for qemu-devel@nongnu.org; Wed, 01 Mar 2023 10:16:15 -0500 Received: from mail-wm1-x331.google.com ([2a00:1450:4864:20::331]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pXOBf-0007c8-Be for qemu-devel@nongnu.org; Wed, 01 Mar 2023 10:16:14 -0500 Received: by mail-wm1-x331.google.com with SMTP id j19-20020a05600c1c1300b003e9b564fae9so12107013wms.2 for ; Wed, 01 Mar 2023 07:16:10 -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=070PzUrZfVxXqhDV3BT8grkHDt8Ezv1S71HCy6H1uh4=; b=QvXBuH+kUPThItsAcy8oxZOLtrKZE8FMKnoRrRYsjjI4HZlACnBPOyHGEBvHheph9q Pq0VLGHgQ77KDsMHbe2qwV2Zfhmh8jpglJAg6DIjIDGXWpJoorYmRc4yKuvml6ZP+pET rePPlzU2dw7gfb+V/e5UpHJedWrOwC4y24ok5nooknXZ+2RkVStyq09fG2h7/CuBfsJu lUp1aKQno7Vb+f8LEbjdDyLiX4Fl7+7sx9ma6OcvH1v3n2r32l7NnaQrMc0dOyhoby7F OP17SRKbquNVvPcFKE79KgJBo/bFwmKsWY3vEXp9YpnutoZAc1P/XiADZOx7AxnuNVvN 3uOA== 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=070PzUrZfVxXqhDV3BT8grkHDt8Ezv1S71HCy6H1uh4=; b=OT1vGjTHm/YfPhyjNklhS/nnr0M88LesYr4C9wbKox8IYTPUSI+75SwKGBBDOq5wyI cENkVANVyr3/iNoypvG7XNdftm8TOgNyz0tHiS2z62SJLdaGy418zq5kC5AIGOPu8qXx gBIADzTxX2BV0nLs+YTFzIF6y2yOEUyJRYKTlGnVXzKOmkJiWdR4fvwldXiKN4GtT2T+ uHjOyzajhqtja+YIWtV6UlM/rEAHMZ3lFOw4s3ZplFu8sZ9crQYAd7+Xb2X5a6C26Kw/ WlYjop5ukZ+n085wFdlmG1cxyBFNRt4KIT/GRc6HgcwnzELS+5jQyE2Z21eXqY0FuJpU tHUQ== X-Gm-Message-State: AO0yUKX+W3ZirYxqyCg2+f4K6AfFfTiVFAYgZpHNkMi2SIpyBY+4aaCM 2B5RQGmjSlK+C8skBsgtyhZMqA== X-Received: by 2002:a05:600c:713:b0:3ea:f883:4ce with SMTP id i19-20020a05600c071300b003eaf88304cemr5180206wmn.20.1677683769795; Wed, 01 Mar 2023 07:16:09 -0800 (PST) Received: from zen.linaroharston ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id i13-20020a1c540d000000b003db06224953sm16421465wmb.41.2023.03.01.07.16.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 01 Mar 2023 07:16:07 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 51F2D1FFBE; Wed, 1 Mar 2023 15:16:05 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: peter.maydell@linaro.org, =?utf-8?q?Alex_Benn=C3=A9e?= , Thomas Huth , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Wainer dos Santos Moschetta , Beraldo Leal Subject: [PULL v2 06/24] gitlab: extend custom runners with base_job_template Date: Wed, 1 Mar 2023 15:15:46 +0000 Message-Id: <20230301151604.1948813-7-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230301151604.1948813-1-alex.bennee@linaro.org> References: <20230301151604.1948813-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::331; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x331.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=ham 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: <20230228190653.1602033-7-alex.bennee@linaro.org> 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: