From patchwork Wed Jan 12 11:27:04 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: 531559 Delivered-To: patch@linaro.org Received: by 2002:a5d:4010:0:0:0:0:0 with SMTP id n16csp1485581wrp; Wed, 12 Jan 2022 03:33:20 -0800 (PST) X-Google-Smtp-Source: ABdhPJxGEUZDW/Pt2XkOSJ8CAvgiNDyXE0R2zdDal60YOrFEqUd8ZnNA2CazMhNcyMFtgfj5ckE8 X-Received: by 2002:a25:ac1:: with SMTP id 184mr11500995ybk.598.1641987200705; Wed, 12 Jan 2022 03:33:20 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1641987200; cv=none; d=google.com; s=arc-20160816; b=FtBsgVNquaC+AQCULgj/PoYp4ryU+EZpzb1Bn0T7z/SupCHjKeDMokUYGSJp7Zl/oR VlxPoRUt5zUXLJBVClxK4FNdpsfvXRsmLj7haYD5HJCtYCwv9m6wzkWf5LMMmabBVv22 iQXHbwm5LO5YvxTmfG3z+WU2wSRh7HMKeaOYgObanbshwCsLpJ36Nu3iOwBp/Cgqoqon A2iff0Rr84+ND/vfIUOAo9O57lKy7lepBVzITeP5WzJJcqVfFs4Cu5GxyyzTr3ZNZRyu 1szyT3J/Cp9s09+yBvT0ztj/WaGgZLUL6hvTjwE/mIR78cp8iijWGJypEumEhSHA6lGG TpDg== 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:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=JBS0UnAvkMjgjVm5KFvh2N9q14vYOpBE5J7+DmeRalQ=; b=cH+iJikGdLc4MwQqICyNq1tr5igHld1V2xZwy/QNjg27qVBgkebbi4f1Yi3lmv+mLa rW5MQTwkjEtbgFpxCoEwiukuOkjAv/9RWU/ySfSm3KjnbwwZOh4ou2A/uCvdZ6crx29D zA1IR2w8wnV2mHpDPusawweq29WRY99esQcMTy3x0tRod9VNvhildA+7BnichcNY1sZo moekRrS3+03ph8ix1VB1GA7/8LWSQk5gLPjNBQTTaadv9mIzfhD0U9+4GH7mDaifuuh/ Qea/flyrlYupOKsgSIIRmlChOdQHMIG4+QzPjspBmB03hdtBYXIdx7HT+6+gn5Js59sd TU7Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b="SPI/zVqr"; 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 a85si4513955ybg.388.2022.01.12.03.33.20 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 12 Jan 2022 03:33:20 -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="SPI/zVqr"; 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]:41342 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1n7bsW-0000KT-3Z for patch@linaro.org; Wed, 12 Jan 2022 06:33:20 -0500 Received: from eggs.gnu.org ([209.51.188.92]:55304) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1n7bn8-0002i3-MS for qemu-devel@nongnu.org; Wed, 12 Jan 2022 06:27:47 -0500 Received: from [2607:f8b0:4864:20::a2d] (port=46604 helo=mail-vk1-xa2d.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1n7bn6-0003Pr-Ba for qemu-devel@nongnu.org; Wed, 12 Jan 2022 06:27:46 -0500 Received: by mail-vk1-xa2d.google.com with SMTP id bj47so1398023vkb.13 for ; Wed, 12 Jan 2022 03:27:43 -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:in-reply-to:references :mime-version:content-transfer-encoding; bh=JBS0UnAvkMjgjVm5KFvh2N9q14vYOpBE5J7+DmeRalQ=; b=SPI/zVqrfn78SSwKeWGN8j10Tl3/0lnosYsF3dzH3DFB/qlYLLLwpuHuM4UaukXZHL W4KXBakZvhiITDCaejD7uNjGqrXRiX06yASrYPGgQStNMZ3a/19mkYG7wel4AWDg86XI RN7A/YzvyVTxv/jGirsBtumckBNJHcPcwwHA98HfTakl+89baHU8a9LqBHnHtTsxAK/Q 8r3Zh/mt51ENmDeE9IEK+Vf03U1wWWlS9VFZvaZYK3dKjJ048adBs1cVLc2E1QSRvLs6 rGTjrL4rRuLlgjdGNSWy2XK4u5LlttyUuZczypifLmPVY6bDx0IFgtKqQSscYFxLRaU6 kVOw== 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=JBS0UnAvkMjgjVm5KFvh2N9q14vYOpBE5J7+DmeRalQ=; b=I17qncU+M41eod/PnkwZK4U4DHtwbS2uL9PmyUlDPtAgtdhnPaJKILzK9fwbBxjWZx 71M+Et1h0jm52Zp+YVbWCM8k0Py3JYxsGpK/OH2V3Zi5xaDnzw/K1t3ILTkpIjXzt+sU 6K/iWsVLtJjGM6E+xqL8Dk+KpUNmSSPCV0youMUMKXRUiJb9FuWjuS+pXBDGsRYfJ0YP HTPkAMxIOix81zQ/KjsncFdCosLFyBEWtS2fTrkP+yoBei7JVZ/IQK6AZFPXNSsGlYUg KzYd0qkzINzd0fhp+Hl9QetdAFrx65Lr0yacXtGWe5kbFYxBxL13fDKKUwgGqhUetiFF qxDw== X-Gm-Message-State: AOAM530Q6QzswWtCUSNOrghfMURoVzc1pvUS2i3HdroQEK0R1GiJR8VE vL+jRyGYTyMS/bnD8MbAjLSong== X-Received: by 2002:a05:6122:208a:: with SMTP id i10mr4423011vkd.18.1641986863362; Wed, 12 Jan 2022 03:27:43 -0800 (PST) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id l27sm4925646vko.17.2022.01.12.03.27.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 12 Jan 2022 03:27:34 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 77CF31FFC5; Wed, 12 Jan 2022 11:27:23 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Subject: [PULL 13/31] tests/docker: remove ubuntu.docker container Date: Wed, 12 Jan 2022 11:27:04 +0000 Message-Id: <20220112112722.3641051-14-alex.bennee@linaro.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220112112722.3641051-1-alex.bennee@linaro.org> References: <20220112112722.3641051-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-Host-Lookup-Failed: Reverse DNS lookup failed for 2607:f8b0:4864:20::a2d (failed) Received-SPF: pass client-ip=2607:f8b0:4864:20::a2d; envelope-from=alex.bennee@linaro.org; helo=mail-vk1-xa2d.google.com X-Spam_score_int: -12 X-Spam_score: -1.3 X-Spam_bar: - X-Spam_report: (-1.3 / 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, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 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: Thomas Huth , =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , Beraldo Leal , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , qemu-devel@nongnu.org, Wainer dos Santos Moschetta , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , =?utf-8?q?Alex_B?= =?utf-8?q?enn=C3=A9e?= Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Daniel P. Berrangé This duplicates the ubuntu2004 container but with an inconsistent set of packages. Reviewed-by: Philippe Mathieu-Daudé Signed-off-by: Daniel P. Berrangé Signed-off-by: Alex Bennée Message-Id: <20211215141949.3512719-14-berrange@redhat.com> Message-Id: <20220105135009.1584676-14-alex.bennee@linaro.org> diff --git a/.gitlab-ci.d/containers.yml b/.gitlab-ci.d/containers.yml index cd06d3f5f4..b9b675fdcb 100644 --- a/.gitlab-ci.d/containers.yml +++ b/.gitlab-ci.d/containers.yml @@ -29,11 +29,6 @@ amd64-ubuntu2004-container: variables: NAME: ubuntu2004 -amd64-ubuntu-container: - extends: .container_job_template - variables: - NAME: ubuntu - amd64-opensuse-leap-container: extends: .container_job_template variables: diff --git a/tests/docker/dockerfiles/ubuntu.docker b/tests/docker/dockerfiles/ubuntu.docker deleted file mode 100644 index f0e0180d21..0000000000 --- a/tests/docker/dockerfiles/ubuntu.docker +++ /dev/null @@ -1,71 +0,0 @@ -# -# Latest Ubuntu Release -# -# Useful for testing against relatively bleeding edge libraries and -# compilers. We also have seperate recipe for the most recent LTS -# release. -# -# When updating use the full tag not :latest otherwise the build -# system won't pick up that it has changed. -# - -FROM docker.io/library/ubuntu:20.04 -ENV PACKAGES \ - ccache \ - clang \ - dbus \ - gcc \ - gettext \ - git \ - glusterfs-common \ - libaio-dev \ - libattr1-dev \ - libbrlapi-dev \ - libbz2-dev \ - libcacard-dev \ - libcap-ng-dev \ - libcurl4-gnutls-dev \ - libdrm-dev \ - libepoxy-dev \ - libfdt-dev \ - libffi-dev \ - libgbm-dev \ - libgnutls28-dev \ - libgtk-3-dev \ - libibverbs-dev \ - libiscsi-dev \ - libjemalloc-dev \ - libjpeg-turbo8-dev \ - liblzo2-dev \ - libncurses5-dev \ - libncursesw5-dev \ - libnfs-dev \ - libnuma-dev \ - libpixman-1-dev \ - libpng-dev \ - librados-dev \ - librbd-dev \ - librdmacm-dev \ - libsasl2-dev \ - libsdl2-dev \ - libseccomp-dev \ - libsnappy-dev \ - libspice-protocol-dev \ - libspice-server-dev \ - libssh-dev \ - libusb-1.0-0-dev \ - libusbredirhost-dev \ - libvdeplug-dev \ - libvte-2.91-dev \ - libxen-dev \ - libzstd-dev \ - make \ - ninja-build \ - python3-yaml \ - python3-sphinx \ - python3-sphinx-rtd-theme \ - sparse \ - xfslibs-dev -RUN apt-get update && \ - DEBIAN_FRONTEND=noninteractive apt-get -y install $PACKAGES -RUN dpkg -l $PACKAGES | sort > /packages.txt