From patchwork Wed Feb 22 15:49:38 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Palmer Dabbelt X-Patchwork-Id: 13149319 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 999D1C61DA4 for ; Wed, 22 Feb 2023 15:56:58 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pUrTd-00067c-UV; Wed, 22 Feb 2023 10:56:18 -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 1pUrTZ-00064z-Ad for qemu-devel@nongnu.org; Wed, 22 Feb 2023 10:56:13 -0500 Received: from mail-pj1-x102d.google.com ([2607:f8b0:4864:20::102d]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pUrTX-0008L2-01 for qemu-devel@nongnu.org; Wed, 22 Feb 2023 10:56:12 -0500 Received: by mail-pj1-x102d.google.com with SMTP id oe18-20020a17090b395200b00236a0d55d3aso9194370pjb.3 for ; Wed, 22 Feb 2023 07:56:10 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20210112.gappssmtp.com; s=20210112; h=to:from:cc:content-transfer-encoding:mime-version:message-id:date :subject:from:to:cc:subject:date:message-id:reply-to; bh=slDmqUv5p7vsOMrfeJKFL1boce1sUErNzA/SV4DGORE=; b=LCeLR2K6m2GkqgoJnB8jOrqhzgGu6yR4k+wOnF9StWd5ZuHl9lPuuh+3drBT18wE+L HKOWpmmL6hduvjBdGQ3F1WcdvXLLQwP5Ao983WIcikJCBTAlk29zFHAJy5EOKWOwiy5z lxFcRxJEuEZv9/dPoluPtzcrRYPX3QCUF0Nsso1MIadOd9BUltr6ORpm3eIy3KrQko3R 31vMWSRdNkrJpjL/JOViUtgljVWtQVjt1zBbuSjXzJMEG0isdm6h/vEu2qHQRnBlRnBU HymKKGrysp+Bl1misyG6ugHHWN92IyV87Vv6O60vL1XjoycT7bysyfc0I4wyl61e9Mdk hCFg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=to:from:cc:content-transfer-encoding:mime-version:message-id:date :subject:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=slDmqUv5p7vsOMrfeJKFL1boce1sUErNzA/SV4DGORE=; b=0hSOJt7YF4siL6WDcR5/kUcSmqUGgg1WDlR/ABQ2KNfgBqXe/8Ur1f1NygJAueMoQl V4FMSD2pX/rFt0hxA4TK4RIxNrzll8gwXkZnb8gr1kGEYFAZsECooIN8qX6SU4FrRIeG XBdzA1GFXtqnqven4dynIOrlGOo4b/Nr1mQNYq8mHfoxMg5KvZ3URgBxy3wzTz88unxR 3IuhyksFDtsXyLA+q5VOap7ZZO4oeGmmRWXSJsXAjVR4IyXWAWDuiT+IxLivntPwz6Lw Hd+kVA6Oyeb+AA9dmkDJwp7rZgy0/SYWYcQK6BzpGDpfJUOWUeJqtsOFcYNjnbHnELAR qDSg== X-Gm-Message-State: AO0yUKUoIpggigBJW450NcqDT2oD/Yb0fi44qM3bV2fErppBM0CiPA6F /6QpdMsevBFxvLnq4iavSur0fw== X-Google-Smtp-Source: AK7set9Gx7NYA5axy6cC3rLkbDeh4X56vVAMkXy+TVH61QCCB9s8dWcunwOkbV/dPzRxRMBfZBMy6w== X-Received: by 2002:a17:90b:17d0:b0:233:b849:7e8f with SMTP id me16-20020a17090b17d000b00233b8497e8fmr8242308pjb.47.1677081369048; Wed, 22 Feb 2023 07:56:09 -0800 (PST) Received: from localhost ([50.221.140.188]) by smtp.gmail.com with ESMTPSA id o14-20020a17090ad24e00b0023087e8adf8sm5054258pjw.21.2023.02.22.07.56.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 22 Feb 2023 07:56:08 -0800 (PST) Subject: [PATCH] gitlab-ci.yml: opensbi: Move to Ubuntu 22.04 Date: Wed, 22 Feb 2023 07:49:38 -0800 Message-Id: <20230222154938.9201-1-palmer@rivosinc.com> X-Mailer: git-send-email 2.39.1 MIME-Version: 1.0 Cc: qemu-riscv@nongnu.org, qemu-devel@nongnu.org, Palmer Dabbelt From: Palmer Dabbelt To: Bin Meng , Peter Maydell , alex.bennee@linaro.org Received-SPF: pass client-ip=2607:f8b0:4864:20::102d; envelope-from=palmer@rivosinc.com; helo=mail-pj1-x102d.google.com X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-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+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org It looks like the Ubuntu 18.04 Docker images are tripping up our CI with $ docker build --cache-from $IMAGE_TAG --tag $CI_REGISTRY_IMAGE:$CI_COMMIT_SHA --tag $IMAGE_TAG .gitlab-ci.d/opensbi Step 1/7 : FROM ubuntu:18.04 18.04: Pulling from library/ubuntu mediaType in manifest should be 'application/vnd.docker.distribution.manifest.v2+json' not 'application/vnd.oci.image.manifest.v1+json' Since 18.04 hits EOL at the end of April (a few months), let's just move to 22.04 now. Signed-off-by: Palmer Dabbelt --- I don't even know how to test this, as I've not touched the CI yet. The hope is that it fixes the failures in . --- .gitlab-ci.d/opensbi/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.d/opensbi/Dockerfile b/.gitlab-ci.d/opensbi/Dockerfile index 4ba8a4de86..2fbc9a9ee7 100644 --- a/.gitlab-ci.d/opensbi/Dockerfile +++ b/.gitlab-ci.d/opensbi/Dockerfile @@ -1,7 +1,7 @@ # # Docker image to cross-compile OpenSBI firmware binaries # -FROM ubuntu:18.04 +FROM ubuntu:22.04 MAINTAINER Bin Meng