[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 08/15] tests/docker: remove travis container
From: |
Alex Bennée |
Subject: |
[PULL 08/15] tests/docker: remove travis container |
Date: |
Mon, 15 Feb 2021 09:42:37 +0000 |
From: Daniel P. Berrangé <berrange@redhat.com>
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>
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Reviewed-by: Wainer dos Santos Moschetta <wainersm@redhat.com>
Message-Id: <20210209135011.1224992-2-berrange@redhat.com>
Message-Id: <20210211122750.22645-9-alex.bennee@linaro.org>
diff --git a/docs/devel/testing.rst b/docs/devel/testing.rst
index 209f9d8172..00ce16de48 100644
--- a/docs/devel/testing.rst
+++ b/docs/devel/testing.rst
@@ -357,20 +357,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 93b29ad823..7cab761bf5 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)
@@ -126,7 +124,7 @@ ifneq ($(HOST_ARCH),x86_64)
DOCKER_PARTIAL_IMAGES += debian-mips-cross debian-mipsel-cross
debian-mips64el-cross
DOCKER_PARTIAL_IMAGES += debian-ppc64el-cross
DOCKER_PARTIAL_IMAGES += debian-s390x-cross
-DOCKER_PARTIAL_IMAGES += fedora travis
+DOCKER_PARTIAL_IMAGES += fedora
endif
docker-image-debian-alpha-cross: docker-image-debian10
@@ -147,8 +145,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
@@ -174,7 +170,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) \
) \
@@ -212,9 +208,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())
--
2.20.1
- [PULL 00/15] testing and gdbstub updates, Alex Bennée, 2021/02/15
- [PULL 01/15] travis.yml: Move gprof/gcov test across to gitlab, Alex Bennée, 2021/02/15
- [PULL 03/15] travis.yml: Move the --enable-modules test to the gitlab-CI, Alex Bennée, 2021/02/15
- [PULL 02/15] travis.yml: Move the -fsanitize=undefined test to the gitlab-CI, Alex Bennée, 2021/02/15
- [PULL 04/15] travis.yml: (Re-)move the --enable-debug jobs, Alex Bennée, 2021/02/15
- [PULL 05/15] travis.yml: Move the -fsanitize=thread testing to the gitlab-CI, Alex Bennée, 2021/02/15
- [PULL 08/15] tests/docker: remove travis container,
Alex Bennée <=
- [PULL 11/15] target/m68k: Drop use of gdb_get_float64() and ldfq_p(), Alex Bennée, 2021/02/15
- [PULL 09/15] MAINTAINERS: Add gdbstub.h to the "GDB stub" section, Alex Bennée, 2021/02/15
- [PULL 06/15] .shippable: remove the last bits, Alex Bennée, 2021/02/15
- [PULL 07/15] travis-ci: Disable C++ optional objects on AArch64 container, Alex Bennée, 2021/02/15
- [PULL 12/15] target/ppc: Drop use of gdb_get_float64() and ldfq_p(), Alex Bennée, 2021/02/15
- [PULL 15/15] tests/tcg: fix silent skipping of softmmu gdb tests, Alex Bennée, 2021/02/15
- [PULL 10/15] target/sh4: Drop use of gdb_get_float32() and ldfl_p(), Alex Bennée, 2021/02/15
- [PULL 14/15] bswap.h: Remove unused float-access functions, Alex Bennée, 2021/02/15
- [PULL 13/15] gdbstub: Remove unused gdb_get_float32() and gdb_get_float64(), Alex Bennée, 2021/02/15
- Re: [PULL 00/15] testing and gdbstub updates, Peter Maydell, 2021/02/15