From patchwork Mon Feb 21 23:06:07 2022 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: 544441 Delivered-To: patch@linaro.org Received: by 2002:ac0:e142:0:0:0:0:0 with SMTP id r2csp3601865imn; Mon, 21 Feb 2022 15:07:25 -0800 (PST) X-Google-Smtp-Source: ABdhPJwyIQrPdBaF3VwxAfGRjt7abMO5iAJCxi+8F0Qko4V9qwt1kEzAYafz50M+20DXOSUiCVDR X-Received: by 2002:a05:622a:1349:b0:2d1:9c38:fe2c with SMTP id w9-20020a05622a134900b002d19c38fe2cmr19595149qtk.253.1645484845645; Mon, 21 Feb 2022 15:07:25 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1645484845; cv=none; d=google.com; s=arc-20160816; b=g9a2nXviY0Kmu6iqlJGjSMB0NAe8D6n3FGKdj9REbwuJQMiZSyRktOhgqDcPrNzpbT PbGsDOrD+EgaTmdZhJX8Ujqx7ciBuPqxvHwuWzWytY+Q4orMPN33tOhfqy+11VVRTXYj Wycgo38tpQOCfasrejndj15ZG+cXhnZkdZlThfLSDBbN4ugsNV0Dxwg2B9XBLD52BdyJ jr5gEbIJFqYbNynEy4yuHMrx1D4BuVL7iVBAdXyBeJtEqzyU4Aa9KuXVfp6lACZxXBuM X2NhioyTg22b3uAe6WdPUvyKEWCzUljv3YsxGWhbLmIoCPQhZfUq4/aX/E4NP/FHr15W wKOA== 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:message-id:date:subject:to:from:dkim-signature; bh=rdZ+dBr53WE7Hi7LZYqmf1P6OroraX4yFubXHeJeyiQ=; b=q4+Thy0x//MhCsL/FJzp4/ZU/EwBRVAFDfGhPtl0/dhyf/g1kE4vCp511YywbMWA+k fiBffEumc6YYmlujq423LR3nEIz/xDbV4oOgEnVN3jdYx2qZBuZ1AMAgwUVRStI5MUt5 jTwG2dRDphXNXrvXx1duPM6702z48gLkEv9vuUEqXA9PX1XWSzT3Ff1z4MlQZ5FcI7Hr j8NiJPm7EvNcxNa4xmtJQyJWlhYJ0U2VvCqaYexswdhnJB1Xhek473aRsE8OX304vrlS kjCJB2+GVOqdd/vGVfDovSSXDCAZ8il2vXurxSYV34YeaGcE6+9O0BUqXFYL3Ou8EAF5 /wtQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=disGSg+S; 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 a8si13543601qvx.469.2022.02.21.15.07.25 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 21 Feb 2022 15:07:25 -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=fail header.i=@linaro.org header.s=google header.b=disGSg+S; 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]:47878 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nMHm9-0004JZ-7m for patch@linaro.org; Mon, 21 Feb 2022 18:07:25 -0500 Received: from eggs.gnu.org ([209.51.188.92]:51362) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nMHlI-0004GX-Fe for qemu-devel@nongnu.org; Mon, 21 Feb 2022 18:06:32 -0500 Received: from [2a00:1450:4864:20::62d] (port=40545 helo=mail-ej1-x62d.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nMHlF-0004aA-Ll for qemu-devel@nongnu.org; Mon, 21 Feb 2022 18:06:32 -0500 Received: by mail-ej1-x62d.google.com with SMTP id p15so36926582ejc.7 for ; Mon, 21 Feb 2022 15:06:23 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=rdZ+dBr53WE7Hi7LZYqmf1P6OroraX4yFubXHeJeyiQ=; b=disGSg+SL/WJ7l+f67NAC+Y3Pm3eWiLg85uZw4ihR4nx3LR5fqwyRP2S1AEQOGA0O5 +9BweWQD7IDN9AKH6RAY0Mowh8Vke7IUlCRp3OlYnhgxuK/oWHInC2Oy7xV6aGs0CTcm 5Hs+IWYQ8Y21fupC9Co3ZhnQln7kRNhoJqRKOg8Esp2nlQ/1qRT+0llyXFTbSTUUSKV6 N9thDFE0mOvyAy6wUNCEzp4ZUk0aVnthQAg6/5MOYs1c4Wdt5CoMuCjId7vi7HvP5qXB t0ScvriWAcwZ5OP/ggRRnlzt6vG4cnOKKerKrm244spsf1fd3HrxtiD7SYOeJbolFbv+ OU2Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=rdZ+dBr53WE7Hi7LZYqmf1P6OroraX4yFubXHeJeyiQ=; b=ADlLab5Mwr0u1OODz/Bhc5jBqq5N18ro+vvhnv5f+DPJauPdqnWqHXGeRCWxdpoohL q5mkw+1/ZLT7LKkhVlFdBgDkvMC0wJmwYfosvV3CA+uCWYA6iixK/Acfa8BHNCiYnHCh Em1aY5oAodn6D8nWpz5XnONa1+j0Vc0AWoYXvnWyEjspEtcwwnRXCrqQmYiSHeNa5R6x 2mVqgHOq8DfH1l9v99/TrljBQtL1VsLr66av0YErgATgJ0BoEYzOvM9fBbmKEB/trbVv OXiNtZa0X7T4cWOrCUe03Pef4MxhF5+UwSwCTX6bSJ2ZaucgxJGSU/cceppF/N6KUCXY uB3Q== X-Gm-Message-State: AOAM531mSiW/YJHL9KFm3rhmv/fOp6hbH5fdnq+5heZos2oJIIUfFOVz y5tVz1lMNrLRmq6WIwVSoGKFtw== X-Received: by 2002:a17:906:2608:b0:6c9:b248:4dcf with SMTP id h8-20020a170906260800b006c9b2484dcfmr16994741ejc.320.1645484781947; Mon, 21 Feb 2022 15:06:21 -0800 (PST) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id v8sm4171287edc.0.2022.02.21.15.06.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 21 Feb 2022 15:06:20 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id BB22F1FFB7; Mon, 21 Feb 2022 23:06:19 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [RFC PATCH] gitlab: upgrade the job definition for s390x to 20.04 Date: Mon, 21 Feb 2022 23:06:07 +0000 Message-Id: <20220221230607.1277120-1-alex.bennee@linaro.org> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 X-Host-Lookup-Failed: Reverse DNS lookup failed for 2a00:1450:4864:20::62d (failed) Received-SPF: pass client-ip=2a00:1450:4864:20::62d; envelope-from=alex.bennee@linaro.org; helo=mail-ej1-x62d.google.com X-Spam_score_int: -6 X-Spam_score: -0.7 X-Spam_bar: / X-Spam_report: (-0.7 / 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, PDS_HP_HELO_NORDNS=0.659, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no 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: , Cc: Peter Maydell , Thomas Huth , Beraldo Leal , Cornelia Huck , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Wainer dos Santos Moschetta , "open list:S390 general arch..." , Christian Borntraeger , =?utf-8?q?Alex_Benn?= =?utf-8?q?=C3=A9e?= Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" The new s390x machine has more of everything including the OS. As 18.04 will soon be going we might as well get onto something moderately modern. Signed-off-by: Alex Bennée Cc: Christian Borntraeger Cc: Peter Maydell Acked-by: Christian Borntraeger Reviewed-by: Thomas Huth Reviewed-by: Philippe Mathieu-Daudé Acked-by: Cornelia Huck --- .gitlab-ci.d/custom-runners.yml | 2 +- ...18.04-s390x.yml => ubuntu-20.04-s390x.yml} | 28 +++++++++---------- 2 files changed, 15 insertions(+), 15 deletions(-) rename .gitlab-ci.d/custom-runners/{ubuntu-18.04-s390x.yml => ubuntu-20.04-s390x.yml} (87%) diff --git a/.gitlab-ci.d/custom-runners.yml b/.gitlab-ci.d/custom-runners.yml index 056c374619..3e76a2034a 100644 --- a/.gitlab-ci.d/custom-runners.yml +++ b/.gitlab-ci.d/custom-runners.yml @@ -14,6 +14,6 @@ variables: GIT_STRATEGY: clone include: - - local: '/.gitlab-ci.d/custom-runners/ubuntu-18.04-s390x.yml' + - local: '/.gitlab-ci.d/custom-runners/ubuntu-20.04-s390x.yml' - local: '/.gitlab-ci.d/custom-runners/ubuntu-20.04-aarch64.yml' - local: '/.gitlab-ci.d/custom-runners/centos-stream-8-x86_64.yml' diff --git a/.gitlab-ci.d/custom-runners/ubuntu-18.04-s390x.yml b/.gitlab-ci.d/custom-runners/ubuntu-20.04-s390x.yml similarity index 87% rename from .gitlab-ci.d/custom-runners/ubuntu-18.04-s390x.yml rename to .gitlab-ci.d/custom-runners/ubuntu-20.04-s390x.yml index f39d874a1e..0333872113 100644 --- a/.gitlab-ci.d/custom-runners/ubuntu-18.04-s390x.yml +++ b/.gitlab-ci.d/custom-runners/ubuntu-20.04-s390x.yml @@ -1,12 +1,12 @@ -# All ubuntu-18.04 jobs should run successfully in an environment +# All ubuntu-20.04 jobs should run successfully in an environment # setup by the scripts/ci/setup/build-environment.yml task -# "Install basic packages to build QEMU on Ubuntu 18.04/20.04" +# "Install basic packages to build QEMU on Ubuntu 20.04/20.04" -ubuntu-18.04-s390x-all-linux-static: +ubuntu-20.04-s390x-all-linux-static: needs: [] stage: build tags: - - ubuntu_18.04 + - ubuntu_20.04 - s390x rules: - if: '$CI_PROJECT_NAMESPACE == "qemu-project" && $CI_COMMIT_BRANCH =~ /^staging/' @@ -21,11 +21,11 @@ ubuntu-18.04-s390x-all-linux-static: - make --output-sync -j`nproc` check V=1 - make --output-sync -j`nproc` check-tcg V=1 -ubuntu-18.04-s390x-all: +ubuntu-20.04-s390x-all: needs: [] stage: build tags: - - ubuntu_18.04 + - ubuntu_20.04 - s390x rules: - if: '$CI_PROJECT_NAMESPACE == "qemu-project" && $CI_COMMIT_BRANCH =~ /^staging/' @@ -37,11 +37,11 @@ ubuntu-18.04-s390x-all: - make --output-sync -j`nproc` - make --output-sync -j`nproc` check V=1 -ubuntu-18.04-s390x-alldbg: +ubuntu-20.04-s390x-alldbg: needs: [] stage: build tags: - - ubuntu_18.04 + - ubuntu_20.04 - s390x rules: - if: '$CI_PROJECT_NAMESPACE == "qemu-project" && $CI_COMMIT_BRANCH =~ /^staging/' @@ -58,11 +58,11 @@ ubuntu-18.04-s390x-alldbg: - make --output-sync -j`nproc` - make --output-sync -j`nproc` check V=1 -ubuntu-18.04-s390x-clang: +ubuntu-20.04-s390x-clang: needs: [] stage: build tags: - - ubuntu_18.04 + - ubuntu_20.04 - s390x rules: - if: '$CI_PROJECT_NAMESPACE == "qemu-project" && $CI_COMMIT_BRANCH =~ /^staging/' @@ -78,11 +78,11 @@ ubuntu-18.04-s390x-clang: - make --output-sync -j`nproc` - make --output-sync -j`nproc` check V=1 -ubuntu-18.04-s390x-tci: +ubuntu-20.04-s390x-tci: needs: [] stage: build tags: - - ubuntu_18.04 + - ubuntu_20.04 - s390x rules: - if: '$CI_PROJECT_NAMESPACE == "qemu-project" && $CI_COMMIT_BRANCH =~ /^staging/' @@ -97,11 +97,11 @@ ubuntu-18.04-s390x-tci: - ../configure --disable-libssh --enable-tcg-interpreter - make --output-sync -j`nproc` -ubuntu-18.04-s390x-notcg: +ubuntu-20.04-s390x-notcg: needs: [] stage: build tags: - - ubuntu_18.04 + - ubuntu_20.04 - s390x rules: - if: '$CI_PROJECT_NAMESPACE == "qemu-project" && $CI_COMMIT_BRANCH =~ /^staging/'