From patchwork Wed Jan 12 11:26:59 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: 531555 Delivered-To: patch@linaro.org Received: by 2002:a5d:4010:0:0:0:0:0 with SMTP id n16csp1484154wrp; Wed, 12 Jan 2022 03:30:28 -0800 (PST) X-Google-Smtp-Source: ABdhPJw0hEouQScAyZudNeTf4GlrakvEe2HSUGbqyF5v+6q4fS01725R5a5+D1l1TpLIDlEkArxh X-Received: by 2002:a25:5d0a:: with SMTP id r10mr12467074ybb.166.1641987028652; Wed, 12 Jan 2022 03:30:28 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1641987028; cv=none; d=google.com; s=arc-20160816; b=Pi6HvsKjSkP3sfLyTX5NPVKlfMcRV8ksGo1CbxPnYibsE4hhzTuZ/0UIQEO1nHCYJu gOLaSebtV70f3r/0xmGYK9Wwd4z0azU57gRNk2syVImUAcC3yvVJjyjFT2isB1bLnJMe 8yjYD6tLDN/K6D6+vYpE79j5WnTVjaxM2tMJtJiare9H3ksX7+CEVv0C/VDSut0I85n6 2i4ZAHCE4Z6K9KqVgigaW+fm8gvZEqbrWJ6K7Yym/x1A8edXptpJhbS/R3BSFrxYtGu5 crxGnoFIhc5RyKVEL42/Uke7Np5/n70iy2ywH/m9J6ABSDiot8ewe9WZy1WPB0p5mH0L Alrg== 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=dOpOjNiCjVbRSWy+ZxB/OjcE4RymyNfyA1Daui2Yh5M=; b=Le05ZT8ltWc7bL11SmTxTuR+zbb1KHmBEa1xSzmw9a7klQ/Tb4s1OLpvt4H+k329C7 PkdIClNCmdvkyZybAdFT4jA5e8mja4bjqLWPPBjHzlOq3qUfsbne419vKRbmdbUk9/RY /nRchNqQjm0MA33Oeh9JXY/vrFo9kNV9XPwDVwR+gnLbjrcSrbFkiB7GvcUuJVPQgU27 7b1s14zAjVzwKxaERELccJLSEBQUOJjjhcvU0CHDJh6b9MRaKOy963ydZ+L4HVNnK3Rv ZnLeg+003KZm/r+mOLtQI+4yGeLkKDYrF58u7x2KnDe1nJBEMtviVD+Harj/iQdWOV17 nhyw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b="HBbIwD/B"; 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 u18si10008820ybc.786.2022.01.12.03.30.28 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 12 Jan 2022 03:30:28 -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="HBbIwD/B"; 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]:60900 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1n7bpj-0002iU-VT for patch@linaro.org; Wed, 12 Jan 2022 06:30:28 -0500 Received: from eggs.gnu.org ([209.51.188.92]:55214) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1n7bn2-0002eI-P4 for qemu-devel@nongnu.org; Wed, 12 Jan 2022 06:27:42 -0500 Received: from [2607:f8b0:4864:20::934] (port=34330 helo=mail-ua1-x934.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1n7bn0-0003Oo-Ar for qemu-devel@nongnu.org; Wed, 12 Jan 2022 06:27:39 -0500 Received: by mail-ua1-x934.google.com with SMTP id y4so4125886uad.1 for ; Wed, 12 Jan 2022 03:27:36 -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=dOpOjNiCjVbRSWy+ZxB/OjcE4RymyNfyA1Daui2Yh5M=; b=HBbIwD/Bw9MBxueTJLDgSht6BRjMePD/UFGeSMrJ3gZLbqzIcp530sNFcGCmayQorH p5TZQ5t7EPUEPUqz2zQhSDz6f593a/7IjpoIs02zpo6ePT8zK0xBVoagU4Os8JphLSn2 dBg8ASOZWLWrtQJnVw8aSakSHEvSuHXhplSABcjDvEd00DBB0/O5QX3zuulX6eeZPEBH zDqHNCoYtmwRBnuT6XHoLFwCQazQtH05yL3s9idDNgKELEv+qphaT/U3VaVmBrTyEe+9 Fpj+QMEGG1yr34slNp/RcU2D4hPqT+Ai00xs7Sw6ZazJdiCf10fVUyTHgseppbuyNG+i Wy7A== 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=dOpOjNiCjVbRSWy+ZxB/OjcE4RymyNfyA1Daui2Yh5M=; b=4VHxiQnh+1jvVIOVgebYKqI9xBtk/hYy5JxqP4tBhV5ernXv0v7BEEYv/C1kUp8WYy UHe79JsLSkZ2ZU22r8IUrNUhdZN+A1DNXUhXJNwG0HDZwTTgIBibjwqVHCNvjYJqdRge /XgAWP0RShE8r9wLfrHhfaHV+WzwEe0HvqjvcmAEM8s6KmZwjHstYhzsc5Zqtig9Y8Na C0ahymKQUPNC2dGhkoJ5o7OAPiYSGQgxUVkwuWOI1RbOjdTrwRAHH6joklesfgaiG8bX 4tnQfBHNcOXoJ1KsE8HC5FdlxT2owm/JZUu8DYmx/Uf0ujAPBEc1u2fC/t4aqAoaR/mo toHA== X-Gm-Message-State: AOAM533phVZoRd0D8et5jyF4iaGAyA+RLpy5V73DBKFjHThXFvNcH/Ea Jx4Ie4DeNZM1ZX7lEsRRlX+C0Q== X-Received: by 2002:a67:33cf:: with SMTP id z198mr4142439vsz.40.1641986856075; Wed, 12 Jan 2022 03:27:36 -0800 (PST) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id d123sm5699888vkg.28.2022.01.12.03.27.29 (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 041771FFC0; Wed, 12 Jan 2022 11:27:23 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Subject: [PULL 08/31] tests/docker: auto-generate centos8.docker with lcitool Date: Wed, 12 Jan 2022 11:26:59 +0000 Message-Id: <20220112112722.3641051-9-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::934 (failed) Received-SPF: pass client-ip=2607:f8b0:4864:20::934; envelope-from=alex.bennee@linaro.org; helo=mail-ua1-x934.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 commit is best examined using the "-b" option to diff. Reviewed-by: Philippe Mathieu-Daudé Signed-off-by: Daniel P. Berrangé Signed-off-by: Alex Bennée Message-Id: <20211215141949.3512719-9-berrange@redhat.com> Message-Id: <20220105135009.1584676-9-alex.bennee@linaro.org> diff --git a/tests/docker/dockerfiles/centos8.docker b/tests/docker/dockerfiles/centos8.docker index 7f135f8e8c..3c62b62a99 100644 --- a/tests/docker/dockerfiles/centos8.docker +++ b/tests/docker/dockerfiles/centos8.docker @@ -1,112 +1,135 @@ -FROM docker.io/centos:8 +# THIS FILE WAS AUTO-GENERATED +# +# $ lcitool dockerfile centos-8 qemu +# +# https://gitlab.com/libvirt/libvirt-ci -RUN dnf -y update -ENV PACKAGES \ - SDL2-devel \ - alsa-lib-devel \ - bc \ - brlapi-devel \ - bzip2 \ - bzip2-devel \ - ca-certificates \ - capstone-devel \ - ccache \ - clang \ - ctags \ - cyrus-sasl-devel \ - daxctl-devel \ - dbus-daemon \ - device-mapper-multipath-devel \ - diffutils \ - findutils \ - gcc \ - gcc-c++ \ - genisoimage \ - gettext \ - git \ - glib2-devel \ - glibc-langpack-en \ - glibc-static \ - glusterfs-api-devel \ - gnutls-devel \ - gtk3-devel \ - hostname \ - jemalloc-devel \ - libaio-devel \ - libasan \ - libattr-devel \ - libbpf-devel \ - libcacard-devel \ - libcap-ng-devel \ - libcurl-devel \ - libdrm-devel \ - libepoxy-devel \ - libfdt-devel \ - libffi-devel \ - libgcrypt-devel \ - libiscsi-devel \ - libjpeg-devel \ - libnfs-devel \ - libpmem-devel \ - libpng-devel \ - librbd-devel \ - libseccomp-devel \ - libselinux-devel \ - libslirp-devel \ - libssh-devel \ - libtasn1-devel \ - libubsan \ - libudev-devel \ - libusbx-devel \ - libxml2-devel \ - libzstd-devel \ - llvm \ - lzo-devel \ - make \ - mesa-libgbm-devel \ - ncurses-devel \ - nettle-devel \ - ninja-build \ - nmap-ncat \ - numactl-devel \ - openssh-clients \ - pam-devel \ - perl \ - perl-Test-Harness \ - pixman-devel \ - pkgconfig \ - pulseaudio-libs-devel \ - python3 \ - python3-PyYAML \ - python3-numpy \ - python3-pillow \ - python3-pip \ - python3-setuptools \ - python3-sphinx \ - python3-sphinx_rtd_theme \ - python3-virtualenv \ - python3-wheel \ - rdma-core-devel \ - rpm \ - sed \ - snappy-devel \ - spice-protocol \ - spice-server-devel \ - systemd-devel \ - systemtap-sdt-devel \ - tar \ - texinfo \ - usbredir-devel \ - util-linux \ - virglrenderer-devel \ - vte291-devel \ - which \ - xfsprogs-devel \ - zlib-devel +FROM docker.io/library/centos:8 -RUN dnf install -y dnf-plugins-core && \ - dnf config-manager --set-enabled powertools && \ - dnf install -y centos-release-advanced-virtualization && \ - dnf install -y epel-release && \ - dnf install -y $PACKAGES -RUN rpm -q $PACKAGES | sort > /packages.txt +RUN dnf update -y && \ + dnf install 'dnf-command(config-manager)' -y && \ + dnf config-manager --set-enabled -y powertools && \ + dnf install -y centos-release-advanced-virtualization && \ + dnf install -y epel-release && \ + dnf install -y \ + SDL2-devel \ + alsa-lib-devel \ + bash \ + bc \ + brlapi-devel \ + bzip2 \ + bzip2-devel \ + ca-certificates \ + capstone-devel \ + ccache \ + clang \ + ctags \ + cyrus-sasl-devel \ + daxctl-devel \ + dbus-daemon \ + device-mapper-multipath-devel \ + diffutils \ + findutils \ + gcc \ + gcc-c++ \ + genisoimage \ + gettext \ + git \ + glib2-devel \ + glib2-static \ + glibc-langpack-en \ + glibc-static \ + glusterfs-api-devel \ + gnutls-devel \ + gtk3-devel \ + hostname \ + jemalloc-devel \ + libaio-devel \ + libasan \ + libattr-devel \ + libbpf-devel \ + libcacard-devel \ + libcap-ng-devel \ + libcurl-devel \ + libdrm-devel \ + libepoxy-devel \ + libfdt-devel \ + libffi-devel \ + libgcrypt-devel \ + libiscsi-devel \ + libjpeg-devel \ + libnfs-devel \ + libpmem-devel \ + libpng-devel \ + librbd-devel \ + libseccomp-devel \ + libselinux-devel \ + libslirp-devel \ + libssh-devel \ + libtasn1-devel \ + libubsan \ + libudev-devel \ + liburing-devel \ + libusbx-devel \ + libxml2-devel \ + libzstd-devel \ + llvm \ + lttng-ust-devel \ + lzo-devel \ + make \ + mesa-libgbm-devel \ + meson \ + ncurses-devel \ + nettle-devel \ + ninja-build \ + nmap-ncat \ + numactl-devel \ + openssh-clients \ + pam-devel \ + pcre-static \ + perl \ + perl-Test-Harness \ + pixman-devel \ + pkgconfig \ + pulseaudio-libs-devel \ + python3 \ + python3-PyYAML \ + python3-numpy \ + python3-pillow \ + python3-pip \ + python3-sphinx \ + python3-sphinx_rtd_theme \ + python3-virtualenv \ + rdma-core-devel \ + rpm \ + sed \ + snappy-devel \ + spice-protocol \ + spice-server-devel \ + systemd-devel \ + systemtap-sdt-devel \ + tar \ + texinfo \ + usbredir-devel \ + util-linux \ + virglrenderer-devel \ + vte291-devel \ + which \ + xfsprogs-devel \ + zlib-devel \ + zlib-static && \ + dnf autoremove -y && \ + dnf clean all -y && \ + rpm -qa | sort > /packages.txt && \ + mkdir -p /usr/libexec/ccache-wrappers && \ + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/c++ && \ + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/cc && \ + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/clang && \ + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/g++ && \ + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/gcc + +ENV LANG "en_US.UTF-8" +ENV MAKE "/usr/bin/make" +ENV NINJA "/usr/bin/ninja" +ENV PYTHON "/usr/bin/python3" +ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" diff --git a/tests/lcitool/refresh b/tests/lcitool/refresh index b47e25f64b..824b1c0ef2 100755 --- a/tests/lcitool/refresh +++ b/tests/lcitool/refresh @@ -61,6 +61,8 @@ def generate_dockerfile(host, target, cross=None, trailer=None): generate(filename, cmd, trailer) try: + generate_dockerfile("centos8", "centos-8") + sys.exit(0) except Exception as ex: print(str(ex), file=sys.stderr)