diff --git a/.github/workflows/cross-compile-daily-mips.yml b/.github/workflows/cross-compile-daily-mips.yml index b372a23ae..164f09c99 100644 --- a/.github/workflows/cross-compile-daily-mips.yml +++ b/.github/workflows/cross-compile-daily-mips.yml @@ -19,4 +19,4 @@ jobs: ref: ${{ matrix.branches }} - name: Run Cross Compilation Targets run: > - sudo make -C scripts/travis ${{ matrix.target }} + sudo make -C scripts/ci ${{ matrix.target }} diff --git a/.github/workflows/cross-compile-daily.yml b/.github/workflows/cross-compile-daily.yml index 78e9c1619..aed08f2c9 100644 --- a/.github/workflows/cross-compile-daily.yml +++ b/.github/workflows/cross-compile-daily.yml @@ -19,4 +19,4 @@ jobs: ref: ${{ matrix.branches }} - name: Run Cross Compilation Targets run: > - sudo make -C scripts/travis ${{ matrix.target }} + sudo make -C scripts/ci ${{ matrix.target }} diff --git a/.github/workflows/cross-compile-mips.yml b/.github/workflows/cross-compile-mips.yml index 4f6c6dbd3..3b475ff03 100644 --- a/.github/workflows/cross-compile-mips.yml +++ b/.github/workflows/cross-compile-mips.yml @@ -18,4 +18,4 @@ jobs: - uses: actions/checkout@v2 - name: Run Cross Compilation Targets run: > - sudo make -C scripts/travis ${{ matrix.target }} + sudo make -C scripts/ci ${{ matrix.target }} diff --git a/.github/workflows/cross-compile.yml b/.github/workflows/cross-compile.yml index 3b007cdd0..d8143b397 100644 --- a/.github/workflows/cross-compile.yml +++ b/.github/workflows/cross-compile.yml @@ -14,4 +14,4 @@ jobs: - uses: actions/checkout@v2 - name: Run Cross Compilation Targets run: > - sudo make -C scripts/travis ${{ matrix.target }} + sudo make -C scripts/ci ${{ matrix.target }} diff --git a/.travis.yml b/.travis.yml index 08d0b2ed6..d6ee9a399 100644 --- a/.travis.yml +++ b/.travis.yml @@ -94,7 +94,7 @@ jobs: - env: TR_ARCH=fedora-rawhide - env: TR_ARCH=local GCOV=1 script: - - sudo make CCACHE=1 -C scripts/travis $TR_ARCH + - sudo make CCACHE=1 -C scripts/ci $TR_ARCH after_success: - ccache -s - - make -C scripts/travis after_success + - make -C scripts/ci after_success diff --git a/Makefile b/Makefile index c33494bec..d765df78c 100644 --- a/Makefile +++ b/Makefile @@ -401,7 +401,7 @@ lint: flake8 --config=scripts/flake8.cfg test/others/rpc/config_file.py flake8 --config=scripts/flake8.cfg lib/py/images/pb2dict.py shellcheck scripts/*.sh - shellcheck scripts/travis/*.sh scripts/travis/travis* scripts/travis/apt-install + shellcheck scripts/ci/*.sh scripts/ci/apt-install include Makefile.install diff --git a/scripts/build/Dockerfile.aarch64-cross b/scripts/build/Dockerfile.aarch64-cross index ab5d9299f..d372b2c91 100644 --- a/scripts/build/Dockerfile.aarch64-cross +++ b/scripts/build/Dockerfile.aarch64-cross @@ -1,6 +1,6 @@ FROM dockcross/base:latest -COPY scripts/travis/apt-install /bin/apt-install +COPY scripts/ci/apt-install /bin/apt-install # Add the cross compiler sources RUN echo "deb http://ftp.us.debian.org/debian/ buster main" >> /etc/apt/sources.list && \ diff --git a/scripts/build/Dockerfile.armv7-cross b/scripts/build/Dockerfile.armv7-cross index 99321e456..b3a18d0ec 100644 --- a/scripts/build/Dockerfile.armv7-cross +++ b/scripts/build/Dockerfile.armv7-cross @@ -1,6 +1,6 @@ FROM dockcross/base:latest -COPY scripts/travis/apt-install /bin/apt-install +COPY scripts/ci/apt-install /bin/apt-install # Add the cross compiler sources RUN echo "deb http://ftp.us.debian.org/debian/ buster main" >> /etc/apt/sources.list && \ diff --git a/scripts/build/Dockerfile.linux32.tmpl b/scripts/build/Dockerfile.linux32.tmpl index 3b3007e9c..49eaeb3b2 100644 --- a/scripts/build/Dockerfile.linux32.tmpl +++ b/scripts/build/Dockerfile.linux32.tmpl @@ -1,7 +1,7 @@ ARG CC=gcc ARG ENV1=FOOBAR -COPY scripts/travis/apt-install /bin/apt-install +COPY scripts/ci/apt-install /bin/apt-install RUN apt-install \ ccache \ diff --git a/scripts/build/Dockerfile.mips64el-cross b/scripts/build/Dockerfile.mips64el-cross index 0458ee887..6f0f32820 100644 --- a/scripts/build/Dockerfile.mips64el-cross +++ b/scripts/build/Dockerfile.mips64el-cross @@ -1,6 +1,6 @@ FROM dockcross/base:latest -COPY scripts/travis/apt-install /bin/apt-install +COPY scripts/ci/apt-install /bin/apt-install # Add the cross compiler sources RUN echo "deb http://ftp.us.debian.org/debian/ buster main" >> /etc/apt/sources.list && \ diff --git a/scripts/build/Dockerfile.openj9-ubuntu b/scripts/build/Dockerfile.openj9-ubuntu index 80af38b1a..0663eb7cc 100644 --- a/scripts/build/Dockerfile.openj9-ubuntu +++ b/scripts/build/Dockerfile.openj9-ubuntu @@ -1,6 +1,6 @@ FROM adoptopenjdk/openjdk8-openj9:latest -COPY scripts/travis/apt-install /bin/apt-install +COPY scripts/ci/apt-install /bin/apt-install RUN apt-install protobuf-c-compiler \ libprotobuf-c-dev \ diff --git a/scripts/build/Dockerfile.ppc64-cross b/scripts/build/Dockerfile.ppc64-cross index fb93a5824..eaa4e4ea2 100644 --- a/scripts/build/Dockerfile.ppc64-cross +++ b/scripts/build/Dockerfile.ppc64-cross @@ -1,6 +1,6 @@ FROM dockcross/base:latest -COPY scripts/travis/apt-install /bin/apt-install +COPY scripts/ci/apt-install /bin/apt-install # Add the cross compiler sources RUN echo "deb http://ftp.us.debian.org/debian/ buster main" >> /etc/apt/sources.list && \ diff --git a/scripts/build/Dockerfile.tmpl b/scripts/build/Dockerfile.tmpl index f4213cea0..2e02d902c 100644 --- a/scripts/build/Dockerfile.tmpl +++ b/scripts/build/Dockerfile.tmpl @@ -1,7 +1,7 @@ ARG CC=gcc ARG ENV1=FOOBAR -COPY scripts/travis/apt-install /bin/apt-install +COPY scripts/ci/apt-install /bin/apt-install RUN apt-install \ ccache \ diff --git a/scripts/build/Dockerfile.x86_64.hdr b/scripts/build/Dockerfile.x86_64.hdr index 2f87c4e8c..7e93c8cc4 100644 --- a/scripts/build/Dockerfile.x86_64.hdr +++ b/scripts/build/Dockerfile.x86_64.hdr @@ -1,5 +1,5 @@ FROM ubuntu:xenial -COPY scripts/travis/apt-install /bin/apt-install +COPY scripts/ci/apt-install /bin/apt-install RUN apt-install gcc-multilib diff --git a/scripts/travis/Makefile b/scripts/ci/Makefile similarity index 92% rename from scripts/travis/Makefile rename to scripts/ci/Makefile index 1af60fe8d..513d58bfb 100644 --- a/scripts/travis/Makefile +++ b/scripts/ci/Makefile @@ -1,9 +1,9 @@ local: - ./travis-tests + ./run-ci-tests.sh .PHONY: local after_success: - ./travis-after_success + ./ci-after-success.sh .PHONY: after_success target-suffix = @@ -46,11 +46,11 @@ restart-docker: $(TARGETS): restart-docker $(MAKE) -C ../build $@$(target-suffix) - docker run --env-file docker.env $(CONTAINER_OPTS) criu-$@ scripts/travis/travis-tests + docker run --env-file docker.env $(CONTAINER_OPTS) criu-$@ scripts/ci/run-ci-tests.sh fedora-asan: restart-docker $(MAKE) -C ../build $@$(target-suffix) - docker run -it $(CONTAINER_OPTS) criu-$@ ./scripts/travis/asan.sh $(ZDTM_OPTIONS) + docker run -it $(CONTAINER_OPTS) criu-$@ ./scripts/ci/asan.sh $(ZDTM_OPTIONS) docker-test: ./docker-test.sh diff --git a/scripts/travis/apt-install b/scripts/ci/apt-install similarity index 100% rename from scripts/travis/apt-install rename to scripts/ci/apt-install diff --git a/scripts/travis/asan.sh b/scripts/ci/asan.sh similarity index 100% rename from scripts/travis/asan.sh rename to scripts/ci/asan.sh diff --git a/scripts/travis/travis-after_success b/scripts/ci/ci-after-success.sh similarity index 100% rename from scripts/travis/travis-after_success rename to scripts/ci/ci-after-success.sh diff --git a/scripts/travis/docker-test.sh b/scripts/ci/docker-test.sh similarity index 97% rename from scripts/travis/docker-test.sh rename to scripts/ci/docker-test.sh index a6990b180..e42e96569 100755 --- a/scripts/travis/docker-test.sh +++ b/scripts/ci/docker-test.sh @@ -32,9 +32,9 @@ fi service docker restart -export SKIP_TRAVIS_TEST=1 +export SKIP_CI_TEST=1 -./travis-tests +./run-ci-tests.sh cd ../../ diff --git a/scripts/travis/docker.env b/scripts/ci/docker.env similarity index 83% rename from scripts/travis/docker.env rename to scripts/ci/docker.env index 36154df0d..399ced694 100644 --- a/scripts/travis/docker.env +++ b/scripts/ci/docker.env @@ -1,4 +1,4 @@ -SKIP_TRAVIS_PREP=1 +SKIP_CI_PREP=1 ZDTM_OPTS=-x zdtm/static/binfmt_misc -x zdtm/static/sched_policy00 CC=gcc SKIP_EXT_DEV_TEST=1 diff --git a/scripts/travis/openj9-test.sh b/scripts/ci/openj9-test.sh similarity index 100% rename from scripts/travis/openj9-test.sh rename to scripts/ci/openj9-test.sh diff --git a/scripts/travis/podman-test.sh b/scripts/ci/podman-test.sh similarity index 98% rename from scripts/travis/podman-test.sh rename to scripts/ci/podman-test.sh index 509113994..f56d10a74 100755 --- a/scripts/travis/podman-test.sh +++ b/scripts/ci/podman-test.sh @@ -17,9 +17,9 @@ apt-get -y purge docker-ce ./apt-install podman containernetworking-plugins -export SKIP_TRAVIS_TEST=1 +export SKIP_CI_TEST=1 -./travis-tests +./run-ci-tests.sh cd ../../ diff --git a/scripts/travis/travis-tests b/scripts/ci/run-ci-tests.sh similarity index 91% rename from scripts/travis/travis-tests rename to scripts/ci/run-ci-tests.sh index 9e1105449..fab392ff2 100755 --- a/scripts/travis/travis-tests +++ b/scripts/ci/run-ci-tests.sh @@ -1,7 +1,7 @@ #!/bin/bash set -x -e -TRAVIS_PKGS="protobuf-c-compiler libprotobuf-c-dev libaio-dev libgnutls28-dev +CI_PKGS="protobuf-c-compiler libprotobuf-c-dev libaio-dev libgnutls28-dev libgnutls30 libprotobuf-dev protobuf-compiler libcap-dev libnl-3-dev gdb bash libnet-dev util-linux asciidoctor libnl-route-3-dev time ccache flake8 libbsd-dev" @@ -15,11 +15,11 @@ if [ -e /etc/lsb-release ]; then # There is one last test running on 16.04 because of the broken # overlayfs in 18.04. Once that is fixed we can remove the last # 16.04 based test and this if clause. - TRAVIS_PKGS="$TRAVIS_PKGS python-future python-protobuf python-yaml - python-junit.xml python-ipaddress" + CI_PKGS="$CI_PKGS python-future python-protobuf python-yaml + python-junit.xml python-ipaddress" else - TRAVIS_PKGS="$TRAVIS_PKGS python3-future python3-protobuf python3-yaml - python3-junit.xml" + CI_PKGS="$CI_PKGS python3-future python3-protobuf python3-yaml + python3-junit.xml" fi fi @@ -31,11 +31,11 @@ if [ "$UNAME_M" != "x86_64" ]; then # For Travis only x86_64 seems to be baremetal. Other # architectures are running in unprivileged LXD containers. # That seems to block most of CRIU's interfaces. - SKIP_TRAVIS_TEST=1 + SKIP_CI_TEST=1 fi -travis_prep () { - [ -n "$SKIP_TRAVIS_PREP" ] && return +ci_prep () { + [ -n "$SKIP_CI_PREP" ] && return cd ../../ @@ -50,13 +50,13 @@ travis_prep () { CC=gcc # clang support if [ "$CLANG" = "1" ]; then - TRAVIS_PKGS="$TRAVIS_PKGS clang" + CI_PKGS="$CI_PKGS clang" CC=clang fi [ -n "$GCOV" ] && { apt-add-repository -y "ppa:ubuntu-toolchain-r/test" - scripts/travis/apt-install --no-install-suggests g++-7 + scripts/ci/apt-install --no-install-suggests g++-7 CC=gcc-7 } @@ -72,10 +72,10 @@ travis_prep () { # Do not install x86_64 specific packages on other architectures if [ "$UNAME_M" = "x86_64" ]; then - TRAVIS_PKGS="$TRAVIS_PKGS $X86_64_PKGS" + CI_PKGS="$CI_PKGS $X86_64_PKGS" fi - scripts/travis/apt-install "$TRAVIS_PKGS" + scripts/ci/apt-install "$CI_PKGS" chmod a+x "$HOME" # zdtm uses an unversioned python binary to run the tests. @@ -91,7 +91,7 @@ test_stream() { ./test/zdtm.py run --stream -p 2 --keep-going -T "$STREAM_TEST_PATTERN" $ZDTM_OPTS } -travis_prep +ci_prep export GCOV $CC --version @@ -107,7 +107,7 @@ if [ "$WIDTH" -gt 80 ]; then exit 1 fi -[ -n "$SKIP_TRAVIS_TEST" ] && exit 0 +[ -n "$SKIP_CI_TEST" ] && exit 0 ulimit -c unlimited @@ -133,7 +133,7 @@ if [ "${COMPAT_TEST}x" = "yx" ] ; then done # shellcheck disable=SC2086 apt-get remove $INCOMPATIBLE_LIBS - scripts/travis/apt-install "$IA32_PKGS" + scripts/ci/apt-install "$IA32_PKGS" mkdir -p /usr/lib/x86_64-linux-gnu/ mv "$REFUGE"/* /usr/lib/x86_64-linux-gnu/ fi diff --git a/scripts/travis/vagrant.sh b/scripts/ci/vagrant.sh similarity index 100% rename from scripts/travis/vagrant.sh rename to scripts/ci/vagrant.sh