From patchwork Tue Apr 30 07:13:34 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Thomas Huth X-Patchwork-Id: 793302 Delivered-To: patch@linaro.org Received: by 2002:a05:6000:54f:b0:34d:5089:5a9e with SMTP id b15csp120203wrf; Tue, 30 Apr 2024 00:17:03 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCU1l5z+s0l3uquzL6CFHBXfxu9CCq8jHzk1nr2DuYvfgSrrdH0f2sEB0xrF4ByNbtc7R+fhygnwE8CtV/janpoP X-Google-Smtp-Source: AGHT+IFX3F7B0Im5CJ97kFtuuiemrBJBV1GCAY3Fq4A0jLrCWFjjIII7s2oBTsIhNq1L7WXcSKmf X-Received: by 2002:a05:620a:28ca:b0:790:7f30:6c0 with SMTP id l10-20020a05620a28ca00b007907f3006c0mr3286995qkp.23.1714461422814; Tue, 30 Apr 2024 00:17:02 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1714461422; cv=none; d=google.com; s=arc-20160816; b=z7ij4KJBn8aqkqmzhwHguDhu17TWmfN587NU3zVbo+11abIw9hA3MiIyMnFFT0OblV Ng945oUszOukUFu8OQDQXUufy8M4Fnhw/qFJUhSBe9OMIItgJzQ960oq4r7Jyrj/jljO 8iq03P+stdsG4YrLtGccKHvEl7TqaUpecY5PDnKjNZG8j/FMxodtRi+YdUDbZluRVKKi gycjWjY9XXy2o1CkQM0RZklhN5oAhtUKzN8HpTVYCpfoliUA6OkLJweW0ZkAqSBpTU/1 MFxP4rd3W24LAtHhPqpvo5+rGzHqNrUrXsb9Ze+uCBnchXQRkJrYHAO9LheJJ63UdOPQ S2aw== 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=V0/55EwLMD8Br/Sk0xX5w07o3dRMXJIZvd13GfK82/4=; fh=PhbD/5Iq9ujS7lAks4ZroU3KNYgfHjF4p+Vf9D3FsjI=; b=UdBAUJx6ilTusNDQ3Xs/JwQq2c5MNSDnnIZCXa2Oc2oR3+fGQR0cz5v9hOvim9VJhD 6vY+sXWwzLujI5309GFBWvOEhAIWjPPaCbCivNFa857gmSjJlnqDrpMEv9D9UocspQQt ZLLEVi/35eoU/WSCbmJtkjbL/xtz067Tii+WbYK7FxsrSeVqElvu2yG3yycpatYCmoq1 7lHV66Cf9INHic4b4xznbOB/wPmcZ5ninaDfUDu5i7MhPyVQJxSb3ax+87JTvjPW74Rr XCUl0DOQD0FQUnAmSCD0//XfncUtUGitvLe8vjKHhfTnkUP7NcmSWI9OXN7zWySqqssm Zrtw==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=Qw9LJyMg; 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=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id j5-20020a37c245000000b007907958c495si18965159qkm.521.2024.04.30.00.17.02 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 30 Apr 2024 00:17:02 -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; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=Qw9LJyMg; 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=redhat.com Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1s1hgq-00015j-Eh; Tue, 30 Apr 2024 03:14:12 -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 1s1hgn-00012X-U4 for qemu-devel@nongnu.org; Tue, 30 Apr 2024 03:14:09 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1s1hgm-0008SN-9s for qemu-devel@nongnu.org; Tue, 30 Apr 2024 03:14:09 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1714461247; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=V0/55EwLMD8Br/Sk0xX5w07o3dRMXJIZvd13GfK82/4=; b=Qw9LJyMgJETxZ5lbpZQvh8H8zQpWEVGFNIWzJ3x+K/wwTT0br8OseauET1raXNGWXGMr// tfrjEN4SMD1mqQolTzG6UzcRMt3PSUUJxgxskIkOL4wNUWB93aHJAYEiB0jwWghOU9O9aI VGXdFZ8Ip8Qe9FSuWU/l6vv44o58obg= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-9-CkkNoU7ROWWYD0NG6F44nQ-1; Tue, 30 Apr 2024 03:14:05 -0400 X-MC-Unique: CkkNoU7ROWWYD0NG6F44nQ-1 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.rdu2.redhat.com [10.11.54.2]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 5CEF389A7E0; Tue, 30 Apr 2024 07:14:05 +0000 (UTC) Received: from thuth-p1g4.redhat.com (unknown [10.39.193.79]) by smtp.corp.redhat.com (Postfix) with ESMTP id 12948400D280; Tue, 30 Apr 2024 07:14:03 +0000 (UTC) From: Thomas Huth To: qemu-devel@nongnu.org, Richard Henderson Cc: =?utf-8?q?Alex_Benn=C3=A9e?= Subject: [PULL 13/19] build-environment: make some packages optional Date: Tue, 30 Apr 2024 09:13:34 +0200 Message-ID: <20240430071340.413305-14-thuth@redhat.com> In-Reply-To: <20240430071340.413305-1-thuth@redhat.com> References: <20240430071340.413305-1-thuth@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.2 Received-SPF: pass client-ip=170.10.129.124; envelope-from=thuth@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -30 X-Spam_score: -3.1 X-Spam_bar: --- X-Spam_report: (-3.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.987, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, 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 Upgrading the s390x runner exposed some packages are not available for it. Add an additional optional stage we only enable for arm64/x86_64 for now. Signed-off-by: Alex Bennée Reviewed-by: Thomas Huth Message-ID: <20240426153938.1707723-2-alex.bennee@linaro.org> Signed-off-by: Thomas Huth --- scripts/ci/setup/build-environment.yml | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/scripts/ci/setup/build-environment.yml b/scripts/ci/setup/build-environment.yml index f344d1a850..de0d866a1e 100644 --- a/scripts/ci/setup/build-environment.yml +++ b/scripts/ci/setup/build-environment.yml @@ -95,7 +95,6 @@ - libpam0g-dev - libpcre2-dev - libpixman-1-dev - - libpmem-dev - libpng-dev - libpulse-dev - librbd-dev @@ -107,7 +106,6 @@ - libslirp-dev - libsnappy-dev - libspice-protocol-dev - - libspice-server-dev - libssh-dev - libsystemd-dev - libtasn1-6-dev @@ -119,7 +117,6 @@ - libvdeplug-dev - libvirglrenderer-dev - libvte-2.91-dev - - libxen-dev - libxml2-dev - libzstd-dev - llvm @@ -156,6 +153,19 @@ - ansible_facts['distribution'] == 'Ubuntu' - ansible_facts['distribution_version'] == '22.04' + # not all packages are available for all architectures + - name: Install additional packages to build QEMU on Ubuntu 22.04 + package: + name: + - libpmem-dev + - libspice-server-dev + - libxen-dev + state: present + when: + - ansible_facts['distribution'] == 'Ubuntu' + - ansible_facts['distribution_version'] == '22.04' + - ansible_facts['architecture'] == 'aarch64' or ansible_facts['architecture'] == 'x86_64' + - name: Install armhf cross-compile packages to build QEMU on AArch64 Ubuntu 22.04 package: name: From patchwork Tue Apr 30 07:13:35 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Thomas Huth X-Patchwork-Id: 793301 Delivered-To: patch@linaro.org Received: by 2002:a05:6000:54f:b0:34d:5089:5a9e with SMTP id b15csp119737wrf; Tue, 30 Apr 2024 00:15:26 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCX6P6VUPlulOw2IZlDah9p+j4ZRVDfVh5SnplUucWfOw0KT3A4ywSAGyu+MVD6GyFHpWKvXo4z1YGhg7pYQ2Iim X-Google-Smtp-Source: AGHT+IEmhG72Cw8Ar/UVE1r3tRY7aMeS4CmpzdjWXj8tl53pOjcX7C2+hJUFsoV4FVoZH8GK2BJA X-Received: by 2002:a25:81d1:0:b0:de5:568a:9a9 with SMTP id n17-20020a2581d1000000b00de5568a09a9mr13052801ybm.38.1714461326472; Tue, 30 Apr 2024 00:15:26 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1714461326; cv=none; d=google.com; s=arc-20160816; b=odU6PH+1FN2me4IGEu/RERK6mEqzzPzR93kZ+HJiR7tWxzlsNiJGsK2CszXy1/y72x khMMrOZrKZaESsJop13OSx05Qhv4De6RYmB6NHZx6h7Dx1jpsbB0TMLqdQd2zotNs5xA c88N7xhCngmGGadtNS1Y0k1MGQtgk5JzTcg0BN87oTxevAqkscOerPsKyAxSowXPq0Am 6BWjPxnHjewE6uXOfhInYMwTxLs8h674tIOpLwHICL+zDL1E8b1SwM1NtGdWvgW3oXIC pI1SbRjEa6gUrPbUhBvJ8JpNJMLqMAPtoG9HnBkaHdQ995QyGiND9a8YT/cJpqtkiDnu dUig== 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=aNfqWdCJaaAOktsdNMfyPhML7pGWVRz5Up9dTUGIj7A=; fh=PhbD/5Iq9ujS7lAks4ZroU3KNYgfHjF4p+Vf9D3FsjI=; b=jW7eo/b63TI2D9TYkiG8dSfT9tZIw2QRXEZCc1f/yXrycE5HR++FGqCD92l0WUwSkv YRxb6OUqzpSLfcgqrLmD0nt8JvE90kPlkNQUEkMxvV/lQ0dXmA8qF9UqACAwqfX1a2ud nn5eoxf3FoCjflxr/uSgd7JY23/pPzCk09iEfMYY6Bm21YHTRiSlE2oZmyNIq3k5n9cs iVE7UyAFAbL0t3VEMvpWckrb0fQ0ZOMSSJTthXk5gtstnrODb3mwYzbodSctaKQzTLVj 0kT/lgG1bJSSUaREx6FsxLbTgZVe+RMVmh7zDcIy10pUolG4MkeHUEj3Iih5y/uTtEuJ YzfA==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b="AqW7IJt/"; 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=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id bt6-20020ac86906000000b00439d0c91676si19195646qtb.290.2024.04.30.00.15.26 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 30 Apr 2024 00:15:26 -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; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b="AqW7IJt/"; 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=redhat.com Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1s1hgr-00018m-Kz; Tue, 30 Apr 2024 03:14:13 -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 1s1hgp-00014n-Uv for qemu-devel@nongnu.org; Tue, 30 Apr 2024 03:14:12 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1s1hgo-0008SX-5N for qemu-devel@nongnu.org; Tue, 30 Apr 2024 03:14:11 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1714461249; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=aNfqWdCJaaAOktsdNMfyPhML7pGWVRz5Up9dTUGIj7A=; b=AqW7IJt/6T5DRnya4Fzq3xiXTkqSm5Z1ezVh4uOhzWNR+BDQKicMmKzGKKunhe7G0gDNeN 0XYanHtsJSnn9dMHrvZJKbTKYAPyr0t4nuIYbperi7ujhlqyjgpxfAfAUB0Kdk/pkdTa99 xWAMsDWUJm/brO5NcL2suRjwYKAQV7k= Received: from mimecast-mx02.redhat.com (mx-ext.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-249-UMq5lItDOHew-Kh4cK7bgw-1; Tue, 30 Apr 2024 03:14:07 -0400 X-MC-Unique: UMq5lItDOHew-Kh4cK7bgw-1 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.rdu2.redhat.com [10.11.54.2]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 299041C031A4; Tue, 30 Apr 2024 07:14:07 +0000 (UTC) Received: from thuth-p1g4.redhat.com (unknown [10.39.193.79]) by smtp.corp.redhat.com (Postfix) with ESMTP id D35BB40C6CC1; Tue, 30 Apr 2024 07:14:05 +0000 (UTC) From: Thomas Huth To: qemu-devel@nongnu.org, Richard Henderson Cc: =?utf-8?q?Alex_Benn=C3=A9e?= Subject: [PULL 14/19] gitlab: migrate the s390x custom machine to 22.04 Date: Tue, 30 Apr 2024 09:13:35 +0200 Message-ID: <20240430071340.413305-15-thuth@redhat.com> In-Reply-To: <20240430071340.413305-1-thuth@redhat.com> References: <20240430071340.413305-1-thuth@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.2 Received-SPF: pass client-ip=170.10.129.124; envelope-from=thuth@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -30 X-Spam_score: -3.1 X-Spam_bar: --- X-Spam_report: (-3.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.987, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, 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 --- .gitlab-ci.d/custom-runners.yml | 2 +- ...20.04-s390x.yml => ubuntu-22.04-s390x.yml} | 28 +++++++++---------- 2 files changed, 15 insertions(+), 15 deletions(-) rename .gitlab-ci.d/custom-runners/{ubuntu-20.04-s390x.yml => ubuntu-22.04-s390x.yml} (88%) diff --git a/.gitlab-ci.d/custom-runners.yml b/.gitlab-ci.d/custom-runners.yml index a0e79acd39..29e52df283 100644 --- a/.gitlab-ci.d/custom-runners.yml +++ b/.gitlab-ci.d/custom-runners.yml @@ -29,7 +29,7 @@ junit: build/meson-logs/testlog.junit.xml 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 88% 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 cdae6c5212..85e2809573 100644 --- a/.gitlab-ci.d/custom-runners/ubuntu-20.04-s390x.yml +++ b/.gitlab-ci.d/custom-runners/ubuntu-22.04-s390x.yml @@ -1,13 +1,13 @@ -# 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: extends: .custom_runner_template needs: [] stage: build tags: - - ubuntu_20.04 + - ubuntu_22.04 - s390x rules: - if: '$CI_PROJECT_NAMESPACE == "qemu-project" && $CI_COMMIT_BRANCH =~ /^staging/' @@ -23,12 +23,12 @@ ubuntu-20.04-s390x-all-linux-static: - make --output-sync check-tcg - make --output-sync -j`nproc` check -ubuntu-20.04-s390x-all: +ubuntu-22.04-s390x-all: extends: .custom_runner_template needs: [] stage: build tags: - - ubuntu_20.04 + - ubuntu_22.04 - s390x timeout: 75m rules: @@ -42,12 +42,12 @@ ubuntu-20.04-s390x-all: - make --output-sync -j`nproc` - make --output-sync -j`nproc` check -ubuntu-20.04-s390x-alldbg: +ubuntu-22.04-s390x-alldbg: extends: .custom_runner_template needs: [] stage: build tags: - - ubuntu_20.04 + - ubuntu_22.04 - s390x rules: - if: '$CI_PROJECT_NAMESPACE == "qemu-project" && $CI_COMMIT_BRANCH =~ /^staging/' @@ -65,12 +65,12 @@ ubuntu-20.04-s390x-alldbg: - make --output-sync -j`nproc` - make --output-sync -j`nproc` check -ubuntu-20.04-s390x-clang: +ubuntu-22.04-s390x-clang: extends: .custom_runner_template needs: [] stage: build tags: - - ubuntu_20.04 + - ubuntu_22.04 - s390x rules: - if: '$CI_PROJECT_NAMESPACE == "qemu-project" && $CI_COMMIT_BRANCH =~ /^staging/' @@ -87,11 +87,11 @@ ubuntu-20.04-s390x-clang: - make --output-sync -j`nproc` - make --output-sync -j`nproc` check -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/' @@ -107,12 +107,12 @@ 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: extends: .custom_runner_template needs: [] stage: build tags: - - ubuntu_20.04 + - ubuntu_22.04 - s390x rules: - if: '$CI_PROJECT_NAMESPACE == "qemu-project" && $CI_COMMIT_BRANCH =~ /^staging/' From patchwork Tue Apr 30 07:13:36 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Thomas Huth X-Patchwork-Id: 793300 Delivered-To: patch@linaro.org Received: by 2002:a05:6000:54f:b0:34d:5089:5a9e with SMTP id b15csp119712wrf; Tue, 30 Apr 2024 00:15:23 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWi9UwAEJO81+yIXDe1/Fd7FHiOpI2458Q4HlAwzIrsr+uWk4CnTuaVLsj77YfuPPvL1lyfmzyTJIADO3JOWJ5A X-Google-Smtp-Source: AGHT+IEPKS14AYwRrXdUDYR+TIgMxll+/NBvmKdBU0iFYcAVkLa7Qdq3ILNKdy9NyR4+oFEVdlPJ X-Received: by 2002:ac8:5807:0:b0:43a:c9de:3509 with SMTP id g7-20020ac85807000000b0043ac9de3509mr8298560qtg.60.1714461322811; Tue, 30 Apr 2024 00:15:22 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1714461322; cv=none; d=google.com; s=arc-20160816; b=DqGFgGbgQv9i3qynu+onifuLDFkcLZ0u7Q5nVVWfVxS6xObdGyyJmngLDgsIx0L9pR Md5pC6edULTVfWNwjbQLC6x+D6EnHFsGLZN+opAu5unPVleHkjCYT3fxNzynY1/nPa5D Xcu4XzWmZjZx9RZfT5XWqFza337hIy+snVbs58JFFKgTtiCHXUoSnO3rvxJdgHU6iD52 w6VYHTIceMY2F5SWWUvJnvrCtdo0rDeeBshR+X8/pq9zhA9HZPMFgNJnyDmLB31daRL1 l9AV29OhoREpnAN1NW6S8G/AnpgLedMSNynRpOOSpyk82XSauUCXSg7iHDeaKO1H6Iui c3uA== 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=13I6haBM/KPAU+M68j7LpmJnCnVrgRN6KGzD3AYQjlM=; fh=PhbD/5Iq9ujS7lAks4ZroU3KNYgfHjF4p+Vf9D3FsjI=; b=hlPOu+HtfE6/PjJSWNwX9BGXXbzthXl4SLGU4hcHWeB6bBb/xtD5j5IRMH+h81UmGB Ug3j7qdGIf+Y4cp/6/lt2H/OavAJIwDZCygoiylmHQ28NhaPbUwq/w7x1U3QU41/Q+YT 4qGuGEHbDdSy/GNU4IpfOUqkjMvZY6sqW5wYhjKwLDso4NozCN1qukEnQPdSAvDryLTZ Lg+ggyvkyUnKgbQORIynl2VEr9/pKQtg/JVY8DDxStZO8RcoK/xXbW8nCUbaVcVoUB0A Z9lGXP6kfeU7hFN1gKeaWxExofbQfgeQitVpjMgprjrK0x8HrRgPsBkDjWX6Dxi5c/hV IVRA==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=PedazfoI; 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=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id fv26-20020a05622a4a1a00b00439f5ddcb2csi18213780qtb.298.2024.04.30.00.15.22 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 30 Apr 2024 00:15:22 -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; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=PedazfoI; 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=redhat.com Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1s1hgv-0001Kq-NJ; Tue, 30 Apr 2024 03:14:17 -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 1s1hgt-0001GN-SR for qemu-devel@nongnu.org; Tue, 30 Apr 2024 03:14:15 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1s1hgs-0008T7-7K for qemu-devel@nongnu.org; Tue, 30 Apr 2024 03:14:15 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1714461253; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=13I6haBM/KPAU+M68j7LpmJnCnVrgRN6KGzD3AYQjlM=; b=PedazfoIjqK0ttPKeOIVXGPd1yjuMbE3CTyaNNYcvxgUd6Oth7LiQBBUtMD9UITXy0pK8y R3WAgyFronmd3nIueCiK9LIJHvR7/yZVQz36JX34sdJxzfbpnfuuXJR48S8c10in+vzERo TwrlNfUmKwkqNjvawUUJgnBxSBCWsBg= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-86-kxu0j_NAPTqK8nO817V5zQ-1; Tue, 30 Apr 2024 03:14:09 -0400 X-MC-Unique: kxu0j_NAPTqK8nO817V5zQ-1 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.rdu2.redhat.com [10.11.54.2]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id EB0BB8032FA; Tue, 30 Apr 2024 07:14:08 +0000 (UTC) Received: from thuth-p1g4.redhat.com (unknown [10.39.193.79]) by smtp.corp.redhat.com (Postfix) with ESMTP id A093D40C140B; Tue, 30 Apr 2024 07:14:07 +0000 (UTC) From: Thomas Huth To: qemu-devel@nongnu.org, Richard Henderson Cc: =?utf-8?q?Alex_Benn=C3=A9e?= Subject: [PULL 15/19] gitlab: remove stale s390x-all-linux-static conf hacks Date: Tue, 30 Apr 2024 09:13:36 +0200 Message-ID: <20240430071340.413305-16-thuth@redhat.com> In-Reply-To: <20240430071340.413305-1-thuth@redhat.com> References: <20240430071340.413305-1-thuth@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.2 Received-SPF: pass client-ip=170.10.133.124; envelope-from=thuth@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -30 X-Spam_score: -3.1 X-Spam_bar: --- X-Spam_report: (-3.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.987, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, 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 The libssh bug references 18.04 which we are no longer running. We don't need to disable glusterfs because a linux-user build shouldn't be trying to link to it anyway. Signed-off-by: Alex Bennée Reviewed-by: Thomas Huth Message-ID: <20240426153938.1707723-4-alex.bennee@linaro.org> Signed-off-by: Thomas Huth --- .gitlab-ci.d/custom-runners/ubuntu-22.04-s390x.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.gitlab-ci.d/custom-runners/ubuntu-22.04-s390x.yml b/.gitlab-ci.d/custom-runners/ubuntu-22.04-s390x.yml index 85e2809573..105981879f 100644 --- a/.gitlab-ci.d/custom-runners/ubuntu-22.04-s390x.yml +++ b/.gitlab-ci.d/custom-runners/ubuntu-22.04-s390x.yml @@ -13,11 +13,9 @@ ubuntu-22.04-s390x-all-linux-static: - if: '$CI_PROJECT_NAMESPACE == "qemu-project" && $CI_COMMIT_BRANCH =~ /^staging/' - if: "$S390X_RUNNER_AVAILABLE" script: - # --disable-libssh is needed because of https://bugs.launchpad.net/qemu/+bug/1838763 - # --disable-glusterfs is needed because there's no static version of those libs in distro supplied packages - mkdir build - cd build - - ../configure --enable-debug --static --disable-system --disable-glusterfs --disable-libssh + - ../configure --enable-debug --static --disable-system || { cat config.log meson-logs/meson-log.txt; exit 1; } - make --output-sync -j`nproc` - make --output-sync check-tcg