From patchwork Wed Jan 5 13:49:48 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: 530165 Delivered-To: patch@linaro.org Received: by 2002:ad5:544f:0:0:0:0:0 with SMTP id a15csp328013imp; Wed, 5 Jan 2022 06:30:29 -0800 (PST) X-Google-Smtp-Source: ABdhPJzEBUf4XD+Z4N043ox0krZQtcZGC1JgZbFVLSTvhpdpDPNj3Ns6m1xESVj4CGwDMkHmpQpt X-Received: by 2002:a25:db0e:: with SMTP id g14mr53700864ybf.60.1641393029024; Wed, 05 Jan 2022 06:30:29 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1641393029; cv=none; d=google.com; s=arc-20160816; b=YRW0ByQt6+g5TH0//P7w/Ca1lHdI//lJRS7Svuk/XxhJirevImRiUu6aIVUpgTcBiw U1uIS71hQ6H/BlE8AmS7sRcqRFa1gRv0kdL89hy+6WYiv25fdcP1aJMWXxpyYOjGb/nH MJLdxR4cHiKlKlGlIsl3LllZdiWEahReKTMXiiWwRbE4arNcv18Yleb25P1oev1ZSW/5 MOPSibXQevgwM2VWWQ1VMAPyeH/Lf6EdP+ZmKD3xOT58LNbUUg6wHpjyb+C9/2bTDVvc 7FUPKWXSoQmfRZWiryQlEXgYWeNj29abHFOKETfR8ZZTkfsYQMpw6w7SymRTazb7VJui eN2A== 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=lJX1Rdn3x6iVR3GQXKCvJ1YiilMWNbxCAjbO3j9CedQ=; b=PSUnMSppbXdV8Ec5vm42kKlzEpGMAYslJs6RZtwKaBCWvB1/5AC3uw8to0dujfEing D45Z3XvsPS7VYzQYSl0ysvqOXayJs6LOvLLu17JV7dCwS3ju9AQOFgC41boVPnBimzMi TxtASu3+2n6RTE3XmPwYH87UGADkzMdI1njFogMWc4WbdyrXEK5YCrLBaQs3FaouC4Bw zirIi+dggguWPL8wYW06MRLuRdj2eS+vTftPbbi9aXnFz0eGI3tfNfgJ/kjUuTHB4y7A sZRB7xIL3CdM6cgg1u1PL+gCxBRx1Ss0rQ75wNjgQxcEJ7AtVIB3tKiua26W5QfSPhQt wn+w== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b="nT/nnJ15"; 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 d9si1016608ybn.240.2022.01.05.06.30.28 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 05 Jan 2022 06:30:29 -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="nT/nnJ15"; 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]:34052 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1n57J6-0003CH-Go for patch@linaro.org; Wed, 05 Jan 2022 09:30:28 -0500 Received: from eggs.gnu.org ([209.51.188.92]:51780) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1n56q1-0004Yy-KZ for qemu-devel@nongnu.org; Wed, 05 Jan 2022 09:00:26 -0500 Received: from [2a00:1450:4864:20::42d] (port=36366 helo=mail-wr1-x42d.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1n56pz-0006RK-8p for qemu-devel@nongnu.org; Wed, 05 Jan 2022 09:00:24 -0500 Received: by mail-wr1-x42d.google.com with SMTP id r17so83198919wrc.3 for ; Wed, 05 Jan 2022 06:00:20 -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=lJX1Rdn3x6iVR3GQXKCvJ1YiilMWNbxCAjbO3j9CedQ=; b=nT/nnJ150mblQGOTb/c7hf9yDaX7qKiymZhWgEnh2vmr0kMNSmUTooJKm718N+4mj5 UHtn/JZ9eHU4KDj6bZxXxrKgMl+blw9vYkPfmuIhgZByEP9wd9dxFD9AkxePSydM1FmM cKDHGDJ+4wg0E8J3B82gHsGBdx4pXAMzLRCCRhrG947jL2HWUohP9WDDiFfwpDzoU7xl E5HGGH30qJpdpI+wOnTEQuoaJV1K2HlL+e8zJCuZ1D2rQQqGtL5d77cDn+3M3CwNgB0g hZ4/OFQYnslWYLOqdG2/0mNPjCjDAAaJB88OrpNs/X4nlLe0LCHccpUTdjdhNZnoNhRT ed4g== 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=lJX1Rdn3x6iVR3GQXKCvJ1YiilMWNbxCAjbO3j9CedQ=; b=6XU6EzICMKl4s26iV7YkD4ilag2rxq9jhIHSC2WTPE47hEBOG0H/MoJRPXFZhKN9So 00jOH8NzgLfH98LuI0Mf4APbUF4nu7HeGg8s3L9C6Jr3DHApZxDGiYVQj4sTA1pE0pFA NXdoqQFfEWtOpBJAnHGm5rAjmO1HP14t8ndhTrHh8jnIGimAf/AxY2MvdxpEzER3mD3a /smWPzYnj+6KWPOt3Z3HzMu32BwttDxttK3jXhsY6MO0G6gTIkXzlempgMQkB/zwxviA pVJbnk0ktfp6SReKpCntXPlHK6hrLa0Inv8VQlDTsQ3lOLJRpVc2WKgimBp3YnH2V39j gvyw== X-Gm-Message-State: AOAM5313xXSM6F6iMYbtUPOn1MZIWSzPAQ/YknssuFdqldKaVdVeUq1F yaVUIYDyEMbb/jfzeMoY6V/I7ZkD46t8OQ== X-Received: by 2002:a5d:64a2:: with SMTP id m2mr46758304wrp.102.1641391219772; Wed, 05 Jan 2022 06:00:19 -0800 (PST) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id o5sm2605678wmc.39.2022.01.05.06.00.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 05 Jan 2022 06:00:19 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 511021FFC5; Wed, 5 Jan 2022 13:50:10 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v1 13/34] tests/docker: remove ubuntu.docker container Date: Wed, 5 Jan 2022 13:49:48 +0000 Message-Id: <20220105135009.1584676-14-alex.bennee@linaro.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220105135009.1584676-1-alex.bennee@linaro.org> References: <20220105135009.1584676-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-Host-Lookup-Failed: Reverse DNS lookup failed for 2a00:1450:4864:20::42d (failed) Received-SPF: pass client-ip=2a00:1450:4864:20::42d; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x42d.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: fam@euphon.net, Thomas Huth , berrange@redhat.com, Beraldo Leal , =?utf-8?q?Alex_Benn=C3=A9e?= , f4bug@amsat.org, Wainer dos Santos Moschetta , stefanha@redhat.com, crosa@redhat.com, pbonzini@redhat.com, =?utf-8?q?Philippe_Mathieu-Daud?= =?utf-8?q?=C3=A9?= , aurelien@aurel32.net 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> --- .gitlab-ci.d/containers.yml | 5 -- tests/docker/dockerfiles/ubuntu.docker | 71 -------------------------- 2 files changed, 76 deletions(-) delete mode 100644 tests/docker/dockerfiles/ubuntu.docker 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