* [PATCH 1/2] tests/docker: remove travis container
2021-02-09 13:50 [PATCH 0/2] travis: remove all use of Travis CI Daniel P. Berrangé
@ 2021-02-09 13:50 ` Daniel P. Berrangé
2021-02-11 12:20 ` Alex Bennée
2021-02-09 13:50 ` [PATCH 2/2] travis: remove travis configuration and all references to Travis CI Daniel P. Berrangé
1 sibling, 1 reply; 9+ messages in thread
From: Daniel P. Berrangé @ 2021-02-09 13:50 UTC (permalink / raw)
To: qemu-devel
Cc: Fam Zheng, Kevin Wolf, Daniel P. Berrangé,
qemu-block, Philippe Mathieu-Daudé,
Wainer dos Santos Moschetta, Max Reitz, Alex Bennée
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.
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Reviewed-by: Wainer dos Santos Moschetta <wainersm@redhat.com>
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
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.29.2
^ permalink raw reply related [flat|nested] 9+ messages in thread* [PATCH 2/2] travis: remove travis configuration and all references to Travis CI
2021-02-09 13:50 [PATCH 0/2] travis: remove all use of Travis CI Daniel P. Berrangé
2021-02-09 13:50 ` [PATCH 1/2] tests/docker: remove travis container Daniel P. Berrangé
@ 2021-02-09 13:50 ` Daniel P. Berrangé
2021-02-09 13:58 ` Philippe Mathieu-Daudé
2021-02-09 14:32 ` Thomas Huth
1 sibling, 2 replies; 9+ messages in thread
From: Daniel P. Berrangé @ 2021-02-09 13:50 UTC (permalink / raw)
To: qemu-devel
Cc: Fam Zheng, Kevin Wolf, Daniel P. Berrangé,
qemu-block, Philippe Mathieu-Daudé,
Max Reitz, Alex Bennée
The Travis CI system QEMU has been using has removed the unlimited free
usage model, replacing it with a one-time only grant of CI minutes that
is not renewed. The QEMU CI jobs quickly exhaust maintainer's free CI
credits, leaving them unable to test with Travis. This is not a
sustainable situation, so we have no choice by to discontinue use of
Travis. GitLab CI is now the primary target, with Cirrus CI filling
in some platform gaps where needed.
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
---
.travis.yml | 439 -----------------------------
MAINTAINERS | 3 -
configure | 1 -
contrib/gitdm/filetypes.txt | 2 +-
scripts/travis/coverage-summary.sh | 27 --
tests/docker/docker.py | 2 +-
tests/qemu-iotests/079 | 2 +-
tests/test-util-filemonitor.c | 11 -
8 files changed, 3 insertions(+), 484 deletions(-)
delete mode 100644 .travis.yml
delete mode 100755 scripts/travis/coverage-summary.sh
diff --git a/.travis.yml b/.travis.yml
deleted file mode 100644
index 5f1dea873e..0000000000
--- a/.travis.yml
+++ /dev/null
@@ -1,439 +0,0 @@
-# The current Travis default is a VM based 16.04 Xenial on GCE
-# Additional builds with specific requirements for a full VM need to
-# be added as additional matrix: entries later on
-os: linux
-dist: focal
-language: c
-compiler:
- - gcc
-cache:
- # There is one cache per branch and compiler version.
- # characteristics of each job are used to identify the cache:
- # - OS name (currently only linux)
- # - OS distribution (for Linux, bionic or focal)
- # - Names and values of visible environment variables set in .travis.yml or Settings panel
- timeout: 1200
- ccache: true
- pip: true
- directories:
- - $HOME/avocado/data/cache
-
-
-addons:
- apt:
- packages:
- # Build dependencies
- - libaio-dev
- - libattr1-dev
- - libbrlapi-dev
- - libcap-ng-dev
- - libgcc-7-dev
- - libgnutls28-dev
- - libgtk-3-dev
- - libiscsi-dev
- - liblttng-ust-dev
- - libncurses5-dev
- - libnfs-dev
- - libnss3-dev
- - libpixman-1-dev
- - libpng-dev
- - librados-dev
- - libsdl2-dev
- - libsdl2-image-dev
- - libseccomp-dev
- - libspice-protocol-dev
- - libspice-server-dev
- - libssh-dev
- - liburcu-dev
- - libusb-1.0-0-dev
- - libvdeplug-dev
- - libvte-2.91-dev
- - libzstd-dev
- - ninja-build
- - sparse
- - uuid-dev
- - gcovr
- # Tests dependencies
- - genisoimage
-
-
-# The channel name "irc.oftc.net#qemu" is encrypted against qemu/qemu
-# to prevent IRC notifications from forks. This was created using:
-# $ travis encrypt -r "qemu/qemu" "irc.oftc.net#qemu"
-notifications:
- irc:
- channels:
- - secure: "F7GDRgjuOo5IUyRLqSkmDL7kvdU4UcH3Lm/W2db2JnDHTGCqgEdaYEYKciyCLZ57vOTsTsOgesN8iUT7hNHBd1KWKjZe9KDTZWppWRYVwAwQMzVeSOsbbU4tRoJ6Pp+3qhH1Z0eGYR9ZgKYAoTumDFgSAYRp4IscKS8jkoedOqM="
- on_success: change
- on_failure: always
-
-
-env:
- global:
- - SRC_DIR=".."
- - BUILD_DIR="build"
- - BASE_CONFIG="--disable-docs --disable-tools"
- - TEST_BUILD_CMD=""
- - TEST_CMD="make check V=1"
- # This is broadly a list of "mainline" softmmu targets which have support across the major distros
- - MAIN_SOFTMMU_TARGETS="aarch64-softmmu,mips64-softmmu,ppc64-softmmu,riscv64-softmmu,s390x-softmmu,x86_64-softmmu"
- - CCACHE_SLOPPINESS="include_file_ctime,include_file_mtime"
- - CCACHE_MAXSIZE=1G
- - G_MESSAGES_DEBUG=error
-
-
-git:
- # we want to do this ourselves
- submodules: false
-
-# Common first phase for all steps
-before_install:
- - if command -v ccache ; then ccache --zero-stats ; fi
- - export JOBS=$(($(getconf _NPROCESSORS_ONLN) + 1))
- - echo "=== Using ${JOBS} simultaneous jobs ==="
-
-# Configure step - may be overridden
-before_script:
- - mkdir -p ${BUILD_DIR} && cd ${BUILD_DIR}
- - ${SRC_DIR}/configure ${BASE_CONFIG} ${CONFIG} || { cat config.log meson-logs/meson-log.txt && exit 1; }
-
-# Main build & test - rarely overridden - controlled by TEST_CMD
-script:
- - BUILD_RC=0 && make -j${JOBS} || BUILD_RC=$?
- - |
- if [ "$BUILD_RC" -eq 0 ] && [ -n "$TEST_BUILD_CMD" ]; then
- ${TEST_BUILD_CMD} || BUILD_RC=$?
- else
- $(exit $BUILD_RC);
- fi
- - |
- if [ "$BUILD_RC" -eq 0 ] ; then
- ${TEST_CMD} ;
- else
- $(exit $BUILD_RC);
- fi
-after_script:
- - df -h
- - if command -v ccache ; then ccache --show-stats ; fi
-
-
-jobs:
- include:
- # --enable-debug implies --enable-debug-tcg, also runs quite a bit slower
- - name: "GCC debug (main-softmmu)"
- env:
- - CONFIG="--enable-debug --target-list=${MAIN_SOFTMMU_TARGETS}"
- - CACHE_NAME="${TRAVIS_BRANCH}-linux-gcc-debug"
-
-
- # TCG debug can be run just on its own and is mostly agnostic to user/softmmu distinctions
- - name: "GCC debug (user)"
- env:
- - CONFIG="--enable-debug-tcg --disable-system"
- - CACHE_NAME="${TRAVIS_BRANCH}-linux-gcc-debug-tcg"
-
- # Module builds are mostly of interest to major distros
- - name: "GCC modules (main-softmmu)"
- env:
- - CONFIG="--enable-modules --target-list=${MAIN_SOFTMMU_TARGETS}"
- - CACHE_NAME="${TRAVIS_BRANCH}-linux-gcc-default"
-
-
- # Test with Clang for compile portability (Travis uses clang-5.0)
- - name: "Clang (user)"
- env:
- - CONFIG="--disable-system --host-cc=clang --cxx=clang++"
- - CACHE_NAME="${TRAVIS_BRANCH}-linux-clang-default"
- compiler: clang
-
-
- - name: "Clang (main-softmmu)"
- env:
- - CONFIG="--target-list=${MAIN_SOFTMMU_TARGETS}
- --host-cc=clang --cxx=clang++"
- - CACHE_NAME="${TRAVIS_BRANCH}-linux-clang-sanitize"
- compiler: clang
- before_script:
- - mkdir -p ${BUILD_DIR} && cd ${BUILD_DIR}
- - ${SRC_DIR}/configure ${CONFIG} --extra-cflags="-fsanitize=undefined -Werror" || { cat config.log meson-logs/meson-log.txt && exit 1; }
-
-
- - name: "Clang (other-softmmu)"
- env:
- - CONFIG="--disable-user --target-list-exclude=${MAIN_SOFTMMU_TARGETS}
- --host-cc=clang --cxx=clang++"
- - CACHE_NAME="${TRAVIS_BRANCH}-linux-clang-default"
- compiler: clang
-
-
- # gprof/gcov are GCC features
- - name: "GCC gprof/gcov"
- dist: bionic
- addons:
- apt:
- packages:
- - ninja-build
- env:
- - CONFIG="--enable-gprof --enable-gcov --disable-libssh
- --target-list=${MAIN_SOFTMMU_TARGETS}"
- after_success:
- - ${SRC_DIR}/scripts/travis/coverage-summary.sh
-
-
- # Using newer GCC with sanitizers
- - name: "GCC9 with sanitizers (softmmu)"
- dist: bionic
- addons:
- apt:
- update: true
- sources:
- # PPAs for newer toolchains
- - ubuntu-toolchain-r-test
- packages:
- # Extra toolchains
- - gcc-9
- - g++-9
- # Build dependencies
- - libaio-dev
- - libattr1-dev
- - libbrlapi-dev
- - libcap-ng-dev
- - libgnutls28-dev
- - libgtk-3-dev
- - libiscsi-dev
- - liblttng-ust-dev
- - libnfs-dev
- - libncurses5-dev
- - libnss3-dev
- - libpixman-1-dev
- - libpng-dev
- - librados-dev
- - libsdl2-dev
- - libsdl2-image-dev
- - libseccomp-dev
- - libspice-protocol-dev
- - libspice-server-dev
- - liburcu-dev
- - libusb-1.0-0-dev
- - libvte-2.91-dev
- - ninja-build
- - sparse
- - uuid-dev
- language: generic
- compiler: none
- env:
- - COMPILER_NAME=gcc CXX=g++-9 CC=gcc-9
- - CONFIG="--cc=gcc-9 --cxx=g++-9 --disable-linux-user"
- - TEST_CMD=""
- before_script:
- - mkdir -p ${BUILD_DIR} && cd ${BUILD_DIR}
- - ${SRC_DIR}/configure ${CONFIG} --extra-cflags="-g3 -O0 -fsanitize=thread" || { cat config.log meson-logs/meson-log.txt && exit 1; }
-
-
- - name: "[aarch64] GCC check-tcg"
- arch: arm64
- dist: focal
- addons:
- apt_packages:
- - libaio-dev
- - libattr1-dev
- - libbrlapi-dev
- - libcap-ng-dev
- - libgcrypt20-dev
- - libgnutls28-dev
- - libgtk-3-dev
- - libiscsi-dev
- - liblttng-ust-dev
- - libncurses5-dev
- - libnfs-dev
- - libnss3-dev
- - libpixman-1-dev
- - libpng-dev
- - librados-dev
- - libsdl2-dev
- - libseccomp-dev
- - liburcu-dev
- - libusb-1.0-0-dev
- - libvdeplug-dev
- - libvte-2.91-dev
- - ninja-build
- # Tests dependencies
- - genisoimage
- env:
- - TEST_CMD="make check check-tcg V=1"
- - CONFIG="--disable-containers --target-list=${MAIN_SOFTMMU_TARGETS}"
- - UNRELIABLE=true
-
- - name: "[ppc64] GCC check-tcg"
- arch: ppc64le
- dist: focal
- addons:
- apt_packages:
- - libaio-dev
- - libattr1-dev
- - libbrlapi-dev
- - libcap-ng-dev
- - libgcrypt20-dev
- - libgnutls28-dev
- - libgtk-3-dev
- - libiscsi-dev
- - liblttng-ust-dev
- - libncurses5-dev
- - libnfs-dev
- - libnss3-dev
- - libpixman-1-dev
- - libpng-dev
- - librados-dev
- - libsdl2-dev
- - libseccomp-dev
- - liburcu-dev
- - libusb-1.0-0-dev
- - libvdeplug-dev
- - libvte-2.91-dev
- - ninja-build
- # Tests dependencies
- - genisoimage
- env:
- - TEST_CMD="make check check-tcg V=1"
- - CONFIG="--disable-containers --target-list=ppc64-softmmu,ppc64le-linux-user"
-
- - name: "[s390x] GCC check-tcg"
- arch: s390x
- dist: bionic
- addons:
- apt_packages:
- - libaio-dev
- - libattr1-dev
- - libbrlapi-dev
- - libcap-ng-dev
- - libgcrypt20-dev
- - libgnutls28-dev
- - libgtk-3-dev
- - libiscsi-dev
- - liblttng-ust-dev
- - libncurses5-dev
- - libnfs-dev
- - libnss3-dev
- - libpixman-1-dev
- - libpng-dev
- - librados-dev
- - libsdl2-dev
- - libseccomp-dev
- - liburcu-dev
- - libusb-1.0-0-dev
- - libvdeplug-dev
- - libvte-2.91-dev
- - ninja-build
- # Tests dependencies
- - genisoimage
- env:
- - TEST_CMD="make check check-tcg V=1"
- - CONFIG="--disable-containers --target-list=${MAIN_SOFTMMU_TARGETS},s390x-linux-user"
- - UNRELIABLE=true
- script:
- - BUILD_RC=0 && make -j${JOBS} || BUILD_RC=$?
- - |
- if [ "$BUILD_RC" -eq 0 ] ; then
- mv pc-bios/s390-ccw/*.img pc-bios/ ;
- ${TEST_CMD} ;
- else
- $(exit $BUILD_RC);
- fi
-
- - name: "[s390x] GCC (other-softmmu)"
- arch: s390x
- dist: bionic
- addons:
- apt_packages:
- - libaio-dev
- - libattr1-dev
- - libcap-ng-dev
- - libgnutls28-dev
- - libiscsi-dev
- - liblttng-ust-dev
- - liblzo2-dev
- - libncurses-dev
- - libnfs-dev
- - libnss3-dev
- - libpixman-1-dev
- - libsdl2-dev
- - libsdl2-image-dev
- - libseccomp-dev
- - libsnappy-dev
- - libzstd-dev
- - nettle-dev
- - xfslibs-dev
- - ninja-build
- # Tests dependencies
- - genisoimage
- env:
- - CONFIG="--disable-containers --audio-drv-list=sdl --disable-user
- --target-list-exclude=${MAIN_SOFTMMU_TARGETS}"
-
- - name: "[s390x] GCC (user)"
- arch: s390x
- dist: bionic
- addons:
- apt_packages:
- - libgcrypt20-dev
- - libgnutls28-dev
- - ninja-build
- env:
- - CONFIG="--disable-containers --disable-system"
-
- - name: "[s390x] Clang (disable-tcg)"
- arch: s390x
- dist: bionic
- compiler: clang
- addons:
- apt_packages:
- - libaio-dev
- - libattr1-dev
- - libbrlapi-dev
- - libcap-ng-dev
- - libgcrypt20-dev
- - libgnutls28-dev
- - libgtk-3-dev
- - libiscsi-dev
- - liblttng-ust-dev
- - libncurses5-dev
- - libnfs-dev
- - libnss3-dev
- - libpixman-1-dev
- - libpng-dev
- - librados-dev
- - libsdl2-dev
- - libseccomp-dev
- - liburcu-dev
- - libusb-1.0-0-dev
- - libvdeplug-dev
- - libvte-2.91-dev
- - ninja-build
- env:
- - TEST_CMD="make check-unit"
- - CONFIG="--disable-containers --disable-tcg --enable-kvm
- --disable-tools --host-cc=clang --cxx=clang++"
- - UNRELIABLE=true
-
- # Release builds
- # The make-release script expect a QEMU version, so our tag must start with a 'v'.
- # This is the case when release candidate tags are created.
- - name: "Release tarball"
- if: tag IS present AND tag =~ /^v\d+\.\d+(\.\d+)?(-\S*)?$/
- env:
- # We want to build from the release tarball
- - BUILD_DIR="release/build/dir" SRC_DIR="../../.."
- - BASE_CONFIG="--prefix=$PWD/dist"
- - CONFIG="--target-list=x86_64-softmmu,aarch64-softmmu,armeb-linux-user,ppc-linux-user"
- - TEST_CMD="make install -j${JOBS}"
- - QEMU_VERSION="${TRAVIS_TAG:1}"
- - CACHE_NAME="${TRAVIS_BRANCH}-linux-gcc-default"
- script:
- - make -C ${SRC_DIR} qemu-${QEMU_VERSION}.tar.bz2
- - ls -l ${SRC_DIR}/qemu-${QEMU_VERSION}.tar.bz2
- - tar -xf ${SRC_DIR}/qemu-${QEMU_VERSION}.tar.bz2 && cd qemu-${QEMU_VERSION}
- - mkdir -p release-build && cd release-build
- - ../configure ${BASE_CONFIG} ${CONFIG} || { cat config.log meson-logs/meson-log.txt && exit 1; }
- - make install
- allow_failures:
- - env: UNRELIABLE=true
diff --git a/MAINTAINERS b/MAINTAINERS
index 06635ba81a..6fb0d9aafa 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -3208,13 +3208,10 @@ M: Fam Zheng <fam@euphon.net>
R: Philippe Mathieu-Daudé <philmd@redhat.com>
S: Maintained
F: .github/lockdown.yml
-F: .travis.yml
-F: scripts/travis/
F: .shippable.yml
F: tests/docker/
F: tests/vm/
F: scripts/archive-source.sh
-W: https://travis-ci.org/qemu/qemu
W: https://app.shippable.com/github/qemu/qemu
W: http://patchew.org/QEMU/
diff --git a/configure b/configure
index 7c496d81fc..058a7c7967 100755
--- a/configure
+++ b/configure
@@ -4872,7 +4872,6 @@ fi
########################################
# See if __attribute__((alias)) is supported.
# This false for Xcode 9, but has been remedied for Xcode 10.
-# Unfortunately, travis uses Xcode 9 by default.
attralias=no
cat > $TMPC << EOF
diff --git a/contrib/gitdm/filetypes.txt b/contrib/gitdm/filetypes.txt
index d2d6f6db8d..bb29166aed 100644
--- a/contrib/gitdm/filetypes.txt
+++ b/contrib/gitdm/filetypes.txt
@@ -81,7 +81,7 @@ filetype tests \.out\.nocache$
filetype tests \.err$
filetype tests \.exit$ # bad-if-FOO.exit etc
filetype tests \.decode$
-filetype tests \.yml$ # travis/shippable config
+filetype tests \.yml$ # gitlab/shippable config
#
# Development documentation files (for hacking generally)
diff --git a/scripts/travis/coverage-summary.sh b/scripts/travis/coverage-summary.sh
deleted file mode 100755
index d7086cf9ca..0000000000
--- a/scripts/travis/coverage-summary.sh
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/bin/sh
-#
-# Author: Alex Bennée <alex.bennee@linaro.org>
-#
-# Summerise the state of code coverage with gcovr and tweak the output
-# to be more sane on Travis hosts. As we expect to be executed on a
-# throw away CI instance we do spam temp files all over the shop. You
-# most likely don't want to execute this script but just call gcovr
-# directly. See also "make coverage-report"
-#
-# This code is licensed under the GPL version 2 or later. See
-# the COPYING file in the top-level directory.
-
-# first generate the coverage report
-gcovr -p -o raw-report.txt
-
-# strip the full-path and line markers
-sed s@$PWD\/@@ raw-report.txt | sed s/[0-9]\*[,-]//g > simplified.txt
-
-# reflow lines that got split
-awk '/.[ch]$/ { printf("%s", $0); next } 1' simplified.txt > rejoined.txt
-
-# columnify
-column -t rejoined.txt > final.txt
-
-# and dump, stripping out 0% coverage
-grep -v "0%" final.txt
diff --git a/tests/docker/docker.py b/tests/docker/docker.py
index d28df4c140..bb42b32a9b 100755
--- a/tests/docker/docker.py
+++ b/tests/docker/docker.py
@@ -228,7 +228,7 @@ class Docker(object):
def __init__(self):
self._command = _guess_engine_command()
- if "docker" in self._command and "TRAVIS" not in os.environ:
+ if "docker" in self._command:
os.environ["DOCKER_BUILDKIT"] = "1"
self._buildkit = True
else:
diff --git a/tests/qemu-iotests/079 b/tests/qemu-iotests/079
index 793e1f9d08..7f758c0f9a 100755
--- a/tests/qemu-iotests/079
+++ b/tests/qemu-iotests/079
@@ -40,7 +40,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
_supported_fmt qcow2
_supported_proto file nfs fuse
-# Some containers (e.g. non-x86 on Travis) do not allow large files
+# Some environments may not allow large files
_require_large_file 4G
echo "=== Check option preallocation and cluster_size ==="
diff --git a/tests/test-util-filemonitor.c b/tests/test-util-filemonitor.c
index b629e10857..c1d29c386a 100644
--- a/tests/test-util-filemonitor.c
+++ b/tests/test-util-filemonitor.c
@@ -408,21 +408,10 @@ test_file_monitor_events(void)
char *pathdst = NULL;
QFileMonitorTestData data;
GHashTable *ids = g_hash_table_new(g_int64_hash, g_int64_equal);
- char *travis_arch;
qemu_mutex_init(&data.lock);
data.records = NULL;
- /*
- * This test does not work on Travis LXD containers since some
- * syscalls are blocked in that environment.
- */
- travis_arch = getenv("TRAVIS_ARCH");
- if (travis_arch && !g_str_equal(travis_arch, "x86_64")) {
- g_test_skip("Test does not work on non-x86 Travis containers.");
- return;
- }
-
/*
* The file monitor needs the main loop running in
* order to receive events from inotify. We must
--
2.29.2
^ permalink raw reply related [flat|nested] 9+ messages in thread