From patchwork Tue Sep 17 18:08:30 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Michael Tokarev X-Patchwork-Id: 829246 Delivered-To: patch@linaro.org Received: by 2002:a5d:44c6:0:b0:367:895a:4699 with SMTP id z6csp425891wrr; Tue, 17 Sep 2024 11:09:33 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCX3bu9RYOFGMNOutLZqdS0vN0g3dRVf9W04j9ghPseMA7+t/g5G3ntIrZlamtB8zQ/d/HdlsQ==@linaro.org X-Google-Smtp-Source: AGHT+IGb0iEhTfotEN5fq6wucl4RbHszeTIhtMpT0lIjtBXbPxL80klx5yBAhxIXiYDKFldiygan X-Received: by 2002:a05:620a:2a01:b0:79f:14de:2a09 with SMTP id af79cd13be357-7a9e5ee781amr2773071685a.8.1726596573333; Tue, 17 Sep 2024 11:09:33 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1726596573; cv=none; d=google.com; s=arc-20240605; b=QdeCfrxNGcEqPxD+dXhbPUFupz5bbGWukRByyDWpyQNbifygzxUsPyj6dPFQ0WaAfi PTDxeL3ewEkrYkG7+qT6aq8WM5zP99gLlMFgwjrDF3qt7q7ZaQBGfUicSm/50BGbkBXB MlxiFxE0OSr/wSaNjhetX6l02uO+P1mjdS435Ui0QTx6+94G+fYqlT86hYYuqzJ6AAR9 SYdUxlQlrjI4NRwjWwOFqvl3Xe2L574Psgml2m5fUcGwZt5aLQ5GYz6A7KFf08AY9Zaq yGaX2Bvst+w3xziEJLz36Ri0wJCmtKU6yFcnHurU8nzCV/OGnUnLDEEgYrYgqLX72bzu 9Jkg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; 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; bh=x0tLpTGZyKTJnWrr6yw0Ct727NP4IOMdifyu7Wd+SXc=; fh=FHMsADLlRMWW9R6yP2bGF48ZObJtNksnF1ZnDLXDa4I=; b=TyJ8Lp5rGh919O8lvm7RUljRheZSD7EcBUyOLfCC26AYhAPKALnACOMWN/OKutBP79 d+DVbkYG1/wQZ/p3bQZcsGqx7P9Ino5imFtGBVqS5Tt2JcQtLBG9vv1MGzQr5hEXGsQP q+Uy39FyeXtz8z9AJTcZsd91V2bY0za0s+QdaI9kC8KErAopeNSHh1vkR5YZee2zX/Sg JkMc942bT0nGqEcsBr+YEGHA5+UE60WEtTy0xzsjNA2CGPODpv3ZC2aIArGR+oFSzPBA w+RTrsHGpVOj1cSazyXALsZYBJaOweG40+d34VAKgquPqQ5kabwLnCpzzrkfk2uMm5pM GPUA==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; 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" Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id af79cd13be357-7ab3e972fb4si884824485a.120.2024.09.17.11.09.33 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 17 Sep 2024 11:09:33 -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; 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" Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sqcdD-0003oD-V1; Tue, 17 Sep 2024 14:08:56 -0400 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 1sqcdC-0003mJ-6d; Tue, 17 Sep 2024 14:08:54 -0400 Received: from isrv.corpit.ru ([86.62.121.231]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1sqcdA-0002MW-1q; Tue, 17 Sep 2024 14:08:53 -0400 Received: from tsrv.corpit.ru (tsrv.tls.msk.ru [192.168.177.2]) by isrv.corpit.ru (Postfix) with ESMTP id 5907D8FBC1; Tue, 17 Sep 2024 21:08:24 +0300 (MSK) Received: from think4mjt.tls.msk.ru (mjtthink.wg.tls.msk.ru [192.168.177.146]) by tsrv.corpit.ru (Postfix) with ESMTP id D3CD113E743; Tue, 17 Sep 2024 21:08:39 +0300 (MSK) From: Michael Tokarev To: qemu-devel@nongnu.org Cc: qemu-stable@nongnu.org, =?utf-8?q?Alex_Benn=C3=A9e?= , Thomas Huth , Michael Tokarev Subject: [Stable-7.2.14 41/47] gitlab: migrate the s390x custom machine to 22.04 Date: Tue, 17 Sep 2024 21:08:30 +0300 Message-Id: <20240917180836.633380-2-mjt@tls.msk.ru> X-Mailer: git-send-email 2.39.5 In-Reply-To: References: MIME-Version: 1.0 Received-SPF: pass client-ip=86.62.121.231; envelope-from=mjt@tls.msk.ru; helo=isrv.corpit.ru X-Spam_score_int: -68 X-Spam_score: -6.9 X-Spam_bar: ------ X-Spam_report: (-6.9 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_HI=-5, 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 From: Alex Bennée 20.04 is dead (from QEMU's point of view), long live 22.04! Signed-off-by: Alex Bennée Reviewed-by: Thomas Huth Message-ID: <20240426153938.1707723-3-alex.bennee@linaro.org> Signed-off-by: Thomas Huth (cherry picked from commit 108d99742af1fa6e977dcfac9d4151b7915e33a3) Signed-off-by: Michael Tokarev (Mjt: context fixups in .gitlab-ci.d/custom-runners/ubuntu-22.04-s390x.yml) diff --git a/.gitlab-ci.d/custom-runners.yml b/.gitlab-ci.d/custom-runners.yml index 97f99e29c2..94414457f1 100644 --- a/.gitlab-ci.d/custom-runners.yml +++ b/.gitlab-ci.d/custom-runners.yml @@ -14,7 +14,7 @@ variables: GIT_STRATEGY: clone include: - - local: '/.gitlab-ci.d/custom-runners/ubuntu-20.04-s390x.yml' + - local: '/.gitlab-ci.d/custom-runners/ubuntu-22.04-s390x.yml' - local: '/.gitlab-ci.d/custom-runners/ubuntu-22.04-aarch64.yml' - local: '/.gitlab-ci.d/custom-runners/ubuntu-22.04-aarch32.yml' - local: '/.gitlab-ci.d/custom-runners/centos-stream-8-x86_64.yml' diff --git a/.gitlab-ci.d/custom-runners/ubuntu-20.04-s390x.yml b/.gitlab-ci.d/custom-runners/ubuntu-22.04-s390x.yml similarity index 89% rename from .gitlab-ci.d/custom-runners/ubuntu-20.04-s390x.yml rename to .gitlab-ci.d/custom-runners/ubuntu-22.04-s390x.yml index 0c835939db..12c6e21119 100644 --- a/.gitlab-ci.d/custom-runners/ubuntu-20.04-s390x.yml +++ b/.gitlab-ci.d/custom-runners/ubuntu-22.04-s390x.yml @@ -1,12 +1,12 @@ -# All ubuntu-20.04 jobs should run successfully in an environment +# All ubuntu-22.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 20.04/20.04" +# "Install basic packages to build QEMU on Ubuntu 22.04" -ubuntu-20.04-s390x-all-linux-static: +ubuntu-22.04-s390x-all-linux-static: needs: [] stage: build tags: - - ubuntu_20.04 + - ubuntu_22.04 - s390x rules: - if: '$CI_PROJECT_NAMESPACE == "qemu-project" && $CI_COMMIT_BRANCH =~ /^staging/' @@ -24,11 +24,11 @@ ubuntu-20.04-s390x-all-linux-static: - make --output-sync -j`nproc` check-tcg V=1 || { cat meson-logs/testlog.txt; exit 1; } ; -ubuntu-20.04-s390x-all: +ubuntu-22.04-s390x-all: needs: [] stage: build tags: - - ubuntu_20.04 + - ubuntu_22.04 - s390x timeout: 75m rules: @@ -43,11 +43,11 @@ ubuntu-20.04-s390x-all: - make --output-sync -j`nproc` check V=1 || { cat meson-logs/testlog.txt; exit 1; } ; -ubuntu-20.04-s390x-alldbg: +ubuntu-22.04-s390x-alldbg: needs: [] stage: build tags: - - ubuntu_20.04 + - ubuntu_22.04 - s390x rules: - if: '$CI_PROJECT_NAMESPACE == "qemu-project" && $CI_COMMIT_BRANCH =~ /^staging/' @@ -66,11 +66,11 @@ ubuntu-20.04-s390x-alldbg: - make --output-sync -j`nproc` check V=1 || { cat meson-logs/testlog.txt; exit 1; } ; -ubuntu-20.04-s390x-clang: +ubuntu-22.04-s390x-clang: needs: [] stage: build tags: - - ubuntu_20.04 + - ubuntu_22.04 - s390x rules: - if: '$CI_PROJECT_NAMESPACE == "qemu-project" && $CI_COMMIT_BRANCH =~ /^staging/' @@ -88,11 +88,11 @@ ubuntu-20.04-s390x-clang: - make --output-sync -j`nproc` check V=1 || { cat meson-logs/testlog.txt; exit 1; } ; -ubuntu-20.04-s390x-tci: +ubuntu-22.04-s390x-tci: needs: [] stage: build tags: - - ubuntu_20.04 + - ubuntu_22.04 - s390x rules: - if: '$CI_PROJECT_NAMESPACE == "qemu-project" && $CI_COMMIT_BRANCH =~ /^staging/' @@ -108,11 +108,11 @@ ubuntu-20.04-s390x-tci: || { cat config.log meson-logs/meson-log.txt; exit 1; } - make --output-sync -j`nproc` -ubuntu-20.04-s390x-notcg: +ubuntu-22.04-s390x-notcg: needs: [] stage: build tags: - - ubuntu_20.04 + - ubuntu_22.04 - s390x rules: - if: '$CI_PROJECT_NAMESPACE == "qemu-project" && $CI_COMMIT_BRANCH =~ /^staging/'