From nobody Tue Nov 18 14:10:29 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1610629543; cv=none; d=zohomail.com; s=zohoarc; b=T99sog4XMkVtxKbjdvougdCSdotvY8Ujmy2JdMz2hRCUpikTZnhRz0vAvO+tFwOvX8ptYQjd+pD2BCn6E91MrpxiStbmEJQu8xqdf8C0AXCxwGiztcM3LUn/gDieBFhyrCZatG1JuPvDktU2gzO5NTQAlbMYN5vPbGlxT5EEJsg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1610629543; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=SpYAMpCuGQKr5bm8UBce7u6ccJh9/lW3Kako+P5pOxo=; b=VoGTSdoifdP89wHeSWjt2qK0Ff/Gd8VfXq+g0eV4sNdpyYxuRU+h9mpgN0e+27UeSTG7uKAw+lBsbmijYC9I/I0LKqKXH+CjB3ZfRcTBV3tYuQyN5mslp3vcuLG+05ksI+AoOiyrjNwPDo5pzbKG3u7AjHy4QlRLYXHj66LsBxo= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1610629543237145.0900290929485; Thu, 14 Jan 2021 05:05:43 -0800 (PST) Received: from localhost ([::1]:46062 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l02Jq-00033p-4V for importer@patchew.org; Thu, 14 Jan 2021 08:05:42 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:44080) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l02HM-0001Md-Ny for qemu-devel@nongnu.org; Thu, 14 Jan 2021 08:03:09 -0500 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:20517) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1l02HJ-0007x9-Vh for qemu-devel@nongnu.org; Thu, 14 Jan 2021 08:03:08 -0500 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-177-BWp1pdHGNxi3kklE_iEg0Q-1; Thu, 14 Jan 2021 08:03:01 -0500 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id DB9FA80A5C5; Thu, 14 Jan 2021 13:02:59 +0000 (UTC) Received: from localhost.localdomain.com (ovpn-115-77.ams2.redhat.com [10.36.115.77]) by smtp.corp.redhat.com (Postfix) with ESMTP id 3A0D85C276; Thu, 14 Jan 2021 13:02:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1610629385; 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=SpYAMpCuGQKr5bm8UBce7u6ccJh9/lW3Kako+P5pOxo=; b=a35OehdpMMTPXCL4g6+vlKJWpzk6ZQGFP9clLJ5GomJqECXhojHnneBbAdQlAqyS1kA5U8 /aJP+BxkNawxHC7jJ2qm8rR6cmg3iAamNsaCTR74wTtRTNRfnGopg8+7AAq5SoySYEmYKa BZCpYrwoeSw09rKF+1g/0nj0f+RUZMk= X-MC-Unique: BWp1pdHGNxi3kklE_iEg0Q-1 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH v2 05/25] tests/docker: remove travis container Date: Thu, 14 Jan 2021 13:02:25 +0000 Message-Id: <20210114130245.1654081-6-berrange@redhat.com> In-Reply-To: <20210114130245.1654081-1-berrange@redhat.com> References: <20210114130245.1654081-1-berrange@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=berrange@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=216.205.24.124; envelope-from=berrange@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -29 X-Spam_score: -3.0 X-Spam_bar: --- X-Spam_report: (-3.0 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.248, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H3=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.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Fam Zheng , Peter Maydell , =?UTF-8?q?Alex=20Benn=C3=A9e?= , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) The travis container that we have no longer matches what travis currently uses. As all x86 jobs are being moved to GitLab CI too, there is no compelling reason to update the travis container. It is simpler to just remove it. Signed-off-by: Daniel P. Berrang=C3=A9 Reviewed-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Wainer dos Santos Moschetta --- docs/devel/testing.rst | 14 -------- tests/docker/Makefile.include | 11 ++---- tests/docker/dockerfiles/travis.docker | 17 ---------- tests/docker/travis | 22 ------------ tests/docker/travis.py | 47 -------------------------- 5 files changed, 2 insertions(+), 109 deletions(-) delete mode 100644 tests/docker/dockerfiles/travis.docker delete mode 100755 tests/docker/travis delete mode 100755 tests/docker/travis.py diff --git a/docs/devel/testing.rst b/docs/devel/testing.rst index 0aa7a13bba..c4ecd90985 100644 --- a/docs/devel/testing.rst +++ b/docs/devel/testing.rst @@ -309,20 +309,6 @@ source and build it. =20 The full list of tests is printed in the ``make docker`` help. =20 -Tools ------ - -There are executables that are created to run in a specific Docker environ= ment. -This makes it easy to write scripts that have heavy or special dependencie= s, -but are still very easy to use. - -Currently the only tool is ``travis``, which mimics the Travis-CI tests in= a -container. It runs in the ``travis`` image: - -.. code:: - - make docker-travis@travis - Debugging a Docker test failure ------------------------------- =20 diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include index c254ac38d0..d91941c05e 100644 --- a/tests/docker/Makefile.include +++ b/tests/docker/Makefile.include @@ -21,8 +21,6 @@ DOCKER_REGISTRY :=3D $(if $(REGISTRY),$(REGISTRY),registr= y.gitlab.com/qemu-project DOCKER_TESTS :=3D $(notdir $(shell \ find $(SRC_PATH)/tests/docker/ -name 'test-*' -type f)) =20 -DOCKER_TOOLS :=3D travis - ENGINE :=3D auto =20 DOCKER_SCRIPT=3D$(SRC_PATH)/tests/docker/docker.py --engine $(ENGINE) @@ -109,7 +107,7 @@ DOCKER_PARTIAL_IMAGES +=3D debian-mips-cross debian-mip= sel-cross debian-mips64el-c DOCKER_PARTIAL_IMAGES +=3D debian-ppc64el-cross DOCKER_PARTIAL_IMAGES +=3D debian-s390x-cross DOCKER_PARTIAL_IMAGES +=3D debian-win32-cross debian-win64-cross -DOCKER_PARTIAL_IMAGES +=3D fedora travis +DOCKER_PARTIAL_IMAGES +=3D fedora endif =20 docker-image-debian-alpha-cross: docker-image-debian10 @@ -130,8 +128,6 @@ docker-image-debian-s390x-cross: docker-image-debian10 docker-image-debian-sh4-cross: docker-image-debian10 docker-image-debian-sparc64-cross: docker-image-debian10 =20 -docker-image-travis: NOUSER=3D1 - # Specialist build images, sometimes very limited tools docker-image-debian-tricore-cross: docker-image-debian10 docker-image-debian-all-test-cross: docker-image-debian10 @@ -157,7 +153,7 @@ DOCKER_PARTIAL_IMAGES +=3D fedora-i386-cross fedora-cri= s-cross =20 # Expand all the pre-requistes for each docker image and test combination $(foreach i,$(filter-out $(DOCKER_PARTIAL_IMAGES),$(DOCKER_IMAGES)), \ - $(foreach t,$(DOCKER_TESTS) $(DOCKER_TOOLS), \ + $(foreach t,$(DOCKER_TESTS), \ $(eval .PHONY: docker-$t@$i) \ $(eval docker-$t@$i: docker-image-$i docker-run-$t@$i) \ ) \ @@ -195,9 +191,6 @@ endif @echo 'Available tests:' @echo ' $(DOCKER_TESTS)' @echo - @echo 'Available tools:' - @echo ' $(DOCKER_TOOLS)' - @echo @echo 'Special variables:' @echo ' TARGET_LIST=3Da,b,c Override target list in builds.' @echo ' EXTRA_CONFIGURE_OPTS=3D"..."' diff --git a/tests/docker/dockerfiles/travis.docker b/tests/docker/dockerfi= les/travis.docker deleted file mode 100644 index cd1435a7e9..0000000000 --- a/tests/docker/dockerfiles/travis.docker +++ /dev/null @@ -1,17 +0,0 @@ -# -# Travis Image - this is broadly the same image that we run our CI -# tests on. -# -FROM travisci/ci-sardonyx:packer-1552557266-f909ac5 -ENV DEBIAN_FRONTEND noninteractive -ENV LANG en_US.UTF-8 -ENV LC_ALL en_US.UTF-8 -RUN sed -i "s/# deb-src/deb-src/" /etc/apt/sources.list -RUN apt-get update -RUN apt-get -y build-dep qemu -RUN apt-get -y install device-tree-compiler python3 python3-yaml dh-autore= conf gdb strace lsof net-tools gcovr ninja-build -# Travis tools require PhantomJS / Neo4j / Maven accessible -# in their PATH (QEMU build won't access them). -ENV PATH /usr/local/phantomjs/bin:/usr/local/phantomjs:/usr/local/neo4j-3.= 2.7/bin:/usr/local/maven-3.5.2/bin:/usr/local/cmake-3.9.2/bin:/usr/local/cl= ang-5.0.0/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin -ENV FEATURES clang pyyaml docs -USER travis diff --git a/tests/docker/travis b/tests/docker/travis deleted file mode 100755 index 47c03677d6..0000000000 --- a/tests/docker/travis +++ /dev/null @@ -1,22 +0,0 @@ -#!/bin/bash -e -# -# Mimic a travis testing matrix -# -# Copyright (c) 2016 Red Hat Inc. -# -# Authors: -# Fam Zheng -# -# This work is licensed under the terms of the GNU GPL, version 2 -# or (at your option) any later version. See the COPYING file in -# the top-level directory. - -. common.rc - -requires pyyaml -cmdfile=3D/tmp/travis_cmd_list.sh -$QEMU_SRC/tests/docker/travis.py $QEMU_SRC/.travis.yml > $cmdfile -chmod +x $cmdfile -cd "$QEMU_SRC" -unset BUILD_DIR SRC_DIR -$cmdfile diff --git a/tests/docker/travis.py b/tests/docker/travis.py deleted file mode 100755 index 37307ac366..0000000000 --- a/tests/docker/travis.py +++ /dev/null @@ -1,47 +0,0 @@ -#!/usr/bin/env python3 -# -# Travis YAML config parser -# -# Copyright (c) 2016 Red Hat Inc. -# -# Authors: -# Fam Zheng -# -# This work is licensed under the terms of the GNU GPL, version 2 -# or (at your option) any later version. See the COPYING file in -# the top-level directory. - -import sys -import yaml -import itertools - -def load_yaml(fname): - return yaml.safe_load(open(fname, "r").read()) - -def conf_iter(conf): - # If "compiler" is omitted from the included env then Travis picks the - # first entry of the global compiler list. - default_compiler =3D conf["compiler"][0] - def env_to_list(env): - return env if isinstance(env, list) else [env] - for entry in conf["matrix"]["include"]: - yield {"env": env_to_list(entry["env"]), - "compiler": entry.get("compiler", default_compiler)} - -def main(): - if len(sys.argv) < 2: - sys.stderr.write("Usage: %s \n" % sys.argv[0]) - return 1 - conf =3D load_yaml(sys.argv[1]) - print("\n".join((": ${%s}" % var for var in conf["env"]["global"]))) - for config in conf_iter(conf): - print("(") - print("\n".join(config["env"])) - print("alias cc=3D" + config["compiler"]) - print("\n".join(conf["before_script"])) - print("\n".join(conf["script"])) - print(")") - return 0 - -if __name__ =3D=3D "__main__": - sys.exit(main()) --=20 2.29.2