From patchwork Thu Feb 23 15:57:13 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: 655986 Delivered-To: patch@linaro.org Received: by 2002:adf:a3c6:0:0:0:0:0 with SMTP id m6csp409829wrb; Thu, 23 Feb 2023 08:00:28 -0800 (PST) X-Google-Smtp-Source: AK7set/718y/0QZS2wF+VDzfofpeMoZXq2Z4affMyU6mbsRB/Z3ImijTlwdjHRi6CVNMnoAWDJzJ X-Received: by 2002:a05:600c:755:b0:3e2:1fe9:8d1b with SMTP id j21-20020a05600c075500b003e21fe98d1bmr5405883wmn.6.1677168028096; Thu, 23 Feb 2023 08:00:28 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1677168028; cv=none; d=google.com; s=arc-20160816; b=XNEbNMXaN08ZnbNEzhRYelDDX6NRYv820DNSZKYwd/1L2LzMtoJbyEj2Wzi7lSv1a4 qWLPWCtUTiO1Wi3lJ5RccK0hhSre5Dmzt2Eo9+fnq423sF70PBM+U7FXoH6GufzSrpEx ZEmrHcEnZQD6IJUoLFMZUJ0dTPJIw/A6uQAfMgT1hFN9jtHdor+AeogYQTjD6EgyEWwR 9LaPJCJCxtOMznjyPTQAwST4551CVA0jhKbLTylsBe758NHJgNiwKSDZGkcAYCPEoXCG RVoE4GuHXm1jB7RpOi/lJRK/NOj7R5Rkqdi5TOH5oOlRYX/b2FJUliDZGIuLQVyogiRP Z/yA== 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=Iz2ihtkdSEiRDQ6YWUZ8LNK4Np/JnVHiwDlZX5etuf8=; b=cYp4WgaExkkuRe2IH2F9o/memItv4b0nXD4NMY2l77oOHS0DcxrF+XHMc3Qpt3PYo2 4xQqszppTl1N0kXxJIxwLo1m7UALGPBLoMQlFiGCQhYdDY44OccAlDhsDvSPIzBaVCRa 9DNJPuyr4jN3LeM1u5Y9QkAMvGhU4ut0+IxpLeTcAywehnWHDq/nlDDeHpb9z8jkOiUQ jeWpaFYNMEA2BbjF/o/66hvlCQ0EA1ZZYbbtMyxBIrxSYzgPp+gjRi8KtCqwEibsdInX 0BG16eLKNi13SZTRMwSzxzzB//Ovkgp7vrKOkyZZAAZ4WCG7K6IKIMUSumKjxFnHeWy5 By4Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=p5cCn6gv; 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 a5-20020adff7c5000000b002c55fc66705si7590533wrq.997.2023.02.23.08.00.27 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 23 Feb 2023 08:00:28 -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=p5cCn6gv; 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 1pVDyO-0000RJ-VA; Thu, 23 Feb 2023 10:57:32 -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 1pVDyL-000079-QV for qemu-devel@nongnu.org; Thu, 23 Feb 2023 10:57:29 -0500 Received: from mail-wr1-x42d.google.com ([2a00:1450:4864:20::42d]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pVDyH-0004iy-HG for qemu-devel@nongnu.org; Thu, 23 Feb 2023 10:57:29 -0500 Received: by mail-wr1-x42d.google.com with SMTP id h14so2387652wru.4 for ; Thu, 23 Feb 2023 07:57:25 -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=Iz2ihtkdSEiRDQ6YWUZ8LNK4Np/JnVHiwDlZX5etuf8=; b=p5cCn6gvoNIv0von55aEg5nsq2kCL25XFTkATql70Q3uVz5xCFG2nHtSXxP3mjLu2i 7BgcK/ZUhffequlr3q+44DKkGc1pnsSKHwBKWrIwRLurIe7rQTZAPu53dIKzl7efmnV8 6AXdLoSD2xruc3EnA0YemqzV/jkYtTY2OCEQhx4R605GxCmi9yFxdUUTICbbRMcWeYKn UivZN5aOPqJtyDzaQCBCSD2HLmcqW/kOmzYof0B/twwhOXJKGRXlAPyjnMvXBBpwZT74 ksdD9622u3WD8lkd3q6rLZfv0ATyswlGqhT/4Xrxl24/2gITfC7elXhpC779umZs7fmn 6lvQ== 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=Iz2ihtkdSEiRDQ6YWUZ8LNK4Np/JnVHiwDlZX5etuf8=; b=iNcu6bEI/cAAjDitcOx9yTIAf9x6AzRabNCOksRofnuqyPnOxKgs9zuSlXfG2S3AFL DzpciQQkTGaQMFN4cTXurqR3uU8GJDpDMcTaNok4GQfnERE0K6npKgRazN5tEXV7xX0s NU7yIZ3QTwlAsU09My2T1VNXiIUQoq5oXopX8oWzGMxPDZ3LNUClYne+/43GjLXKy8Vx /njbs23n7ND1hwWF6RpN2yMWHCepCEe8964BbP/UXJWL8UYWtwS4XAVfiAmOw+rDxf9L tbVahynFQMmJvAJY7PLfxchnhEfaD8JyQJchcaouiE/+Ip8GddP9lvbyaELpEH6jAK6/ rE2w== X-Gm-Message-State: AO0yUKU6Fcv6vvZW1VylWhYcdObFuFLvapHm7kJLSGQB9/ybU1+kopBL Ki9tQQ+EmO2uotEmZXpBo0WOHg== X-Received: by 2002:a5d:6b4d:0:b0:2c6:67eb:a9d7 with SMTP id x13-20020a5d6b4d000000b002c667eba9d7mr12092814wrw.27.1677167844137; Thu, 23 Feb 2023 07:57:24 -0800 (PST) Received: from zen.linaroharston ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id o18-20020a05600c4fd200b003e9ded91c27sm4676210wmq.4.2023.02.23.07.57.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 23 Feb 2023 07:57:23 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 2AC7F1FFBD; Thu, 23 Feb 2023 15:57:21 +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 06/13] gitlab: extend custom runners with base_job_template Date: Thu, 23 Feb 2023 15:57:13 +0000 Message-Id: <20230223155720.310593-7-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230223155720.310593-1-alex.bennee@linaro.org> References: <20230223155720.310593-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::42d; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x42d.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: <20230221094558.2864616-8-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: