Re: [PATCH v2 05/25] tests/docker: remove travis container

[Wainer dos Santos Moschetta <wainersm@redhat.com>]

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é <berrange@redhat.com>
> ---
>   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 <wainersm@redhat.com>


>
> 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 <famz@redhat.com>
> -#
> -# 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 <famz@redhat.com>
> -#
> -# 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 <travis-file>\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())