From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-22.5 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,MENTIONS_GIT_HOSTING, NICE_REPLY_A,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_SANE_1 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id A0021C433DB for ; Fri, 15 Jan 2021 14:51:40 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id 1CC3523772 for ; Fri, 15 Jan 2021 14:51:40 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 1CC3523772 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:52572 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l0QRv-0006kF-A9 for qemu-devel@archiver.kernel.org; Fri, 15 Jan 2021 09:51:39 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:60894) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l0QR1-0005mo-HU for qemu-devel@nongnu.org; Fri, 15 Jan 2021 09:50:43 -0500 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:24556) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1l0QQz-00083u-5w for qemu-devel@nongnu.org; Fri, 15 Jan 2021 09:50:43 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1610722240; 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=Gxetqwxxb7EBdTWFTr78uhNZPC1gqGREfzPIKrr9OnI=; b=OoXXTmesqvFUeyzcy4YLIwZwyHMTZ8sBrmM+2ccXNoWtZpJgF/imS33/Us/9RZ8MgqKlrE CkAjfUIzB7n188cKieDJkYJuvq7487YKIoYM5Q7CE2uuLb4HLR07nSAHXm2PY5CbBB4DWg HXVDLb6yZXwormmyoObdx/ZkCbi4ItQ= 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-221-hXmC8yHDNaSGswz1KQ5cUw-1; Fri, 15 Jan 2021 09:50:37 -0500 X-MC-Unique: hXmC8yHDNaSGswz1KQ5cUw-1 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 49DC11005E42; Fri, 15 Jan 2021 14:50:36 +0000 (UTC) Received: from wainer-laptop.localdomain (ovpn-116-88.gru2.redhat.com [10.97.116.88]) by smtp.corp.redhat.com (Postfix) with ESMTP id BD69C6F7EC; Fri, 15 Jan 2021 14:50:30 +0000 (UTC) Subject: Re: [PATCH v2 05/25] tests/docker: remove travis container To: =?UTF-8?Q?Daniel_P=2e_Berrang=c3=a9?= , qemu-devel@nongnu.org References: <20210114130245.1654081-1-berrange@redhat.com> <20210114130245.1654081-6-berrange@redhat.com> From: Wainer dos Santos Moschetta Message-ID: Date: Fri, 15 Jan 2021 11:50:27 -0300 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.4.0 MIME-Version: 1.0 In-Reply-To: <20210114130245.1654081-6-berrange@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=wainersm@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 8bit Content-Language: en-US Received-SPF: pass client-ip=216.205.24.124; envelope-from=wainersm@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.25, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, NICE_REPLY_A=-0.001, 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_Benn=c3=a9e?= , =?UTF-8?Q?Philippe_Mathieu-Daud=c3=a9?= Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" On 1/14/21 10:02 AM, Daniel P. Berrangé wrote: > 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é > --- > 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 Reviewed-by: Wainer dos Santos Moschetta > > 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. > > The full list of tests is printed in the ``make docker`` help. > > -Tools > ------ > - > -There are executables that are created to run in a specific Docker environment. > -This makes it easy to write scripts that have heavy or special dependencies, > -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 > ------------------------------- > > 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 := $(if $(REGISTRY),$(REGISTRY),registry.gitlab.com/qemu-project > DOCKER_TESTS := $(notdir $(shell \ > find $(SRC_PATH)/tests/docker/ -name 'test-*' -type f)) > > -DOCKER_TOOLS := travis > - > ENGINE := auto > > DOCKER_SCRIPT=$(SRC_PATH)/tests/docker/docker.py --engine $(ENGINE) > @@ -109,7 +107,7 @@ DOCKER_PARTIAL_IMAGES += debian-mips-cross debian-mipsel-cross debian-mips64el-c > DOCKER_PARTIAL_IMAGES += debian-ppc64el-cross > DOCKER_PARTIAL_IMAGES += debian-s390x-cross > DOCKER_PARTIAL_IMAGES += debian-win32-cross debian-win64-cross > -DOCKER_PARTIAL_IMAGES += fedora travis > +DOCKER_PARTIAL_IMAGES += fedora > endif > > 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 > > -docker-image-travis: NOUSER=1 > - > # 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 += fedora-i386-cross fedora-cris-cross > > # 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=a,b,c Override target list in builds.' > @echo ' EXTRA_CONFIGURE_OPTS="..."' > diff --git a/tests/docker/dockerfiles/travis.docker b/tests/docker/dockerfiles/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-autoreconf 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/clang-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=/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 = 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 = 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=" + config["compiler"]) > - print("\n".join(conf["before_script"])) > - print("\n".join(conf["script"])) > - print(")") > - return 0 > - > -if __name__ == "__main__": > - sys.exit(main())