From 1c4eec16858f0f183d1adf098250804121caa3d9 Mon Sep 17 00:00:00 2001
From: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
Date: Fri, 10 May 2024 17:14:43 +0900
Subject: [PATCH] CI: drop CentOS 7

CentOS 7 will reach EOL on June 30, 2024

Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
---
 .github/workflows/main.yaml | 31 -------------
 Dockerfile.buildtests       |  1 -
 Vagrantfile                 | 86 -------------------------------------
 3 files changed, 118 deletions(-)
 delete mode 100644 Vagrantfile

diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml
index abe9b2a..a7bd0fc 100644
--- a/.github/workflows/main.yaml
+++ b/.github/workflows/main.yaml
@@ -17,34 +17,3 @@ jobs:
     steps:
     - uses: actions/checkout@v2
     - run: DOCKER_BUILDKIT=1 docker build -f Dockerfile.buildtests .
-  test-centos7:
-    runs-on: macos-12
-    env:
-      LIBSECCOMP_COMMIT: v2.3.3
-      LIBSLIRP_COMMIT: v4.1.0
-      BENCHMARK_IPERF3_DURATION: 3
-    steps:
-    - uses: actions/checkout@v2
-    - name: Setup CentOS 7 VM
-      run: |
-        vagrant up --provision --no-tty
-        cat > ./run-vagrant-tests <<'EOF'
-        exec vagrant ssh --no-tty -c "
-          export LIBSECCOMP_COMMIT=\"${LIBSECCOMP_COMMIT}\"
-          export LIBSLIRP_COMMIT=\"${LIBSLIRP_COMMIT}\"
-          export BENCHMARK_IPERF3_DURATION=\"${BENCHMARK_IPERF3_DURATION}\"
-          /src/build-and-test
-        "
-        EOF
-    - name: Build and test with Debian 10's version of libseccomp
-      run: sh ./run-vagrant-tests
-    - name: Build and test with Ubuntu 20.04's versions of libseccomp/libslirp
-      run: sh ./run-vagrant-tests
-      env:
-        LIBSECCOMP_COMMIT: v2.4.3
-        LIBSLIRP_COMMIT: v4.1.0
-    - name: Build and test with recent versions of libseccomp/libslirp
-      run: sh ./run-vagrant-tests
-      env:
-        LIBSECCOMP_COMMIT: v2.5.4
-        LIBSLIRP_COMMIT: v4.7.0
diff --git a/Dockerfile.buildtests b/Dockerfile.buildtests
index 620ddaa..badf6e6 100644
--- a/Dockerfile.buildtests
+++ b/Dockerfile.buildtests
@@ -28,7 +28,6 @@ FROM buildtest-ubuntu1804-common AS buildtest-ubuntu1804-dynamic
 RUN ./configure && make && cp -f slirp4netns /
 
 # CentOS 7 is no longer tested in this file.
-# See Vagrantfile for CentOS 7 tests.
 
 # openSUSE (dynamic only)
 FROM opensuse/leap:15 AS buildtest-opensuse15-common
diff --git a/Vagrantfile b/Vagrantfile
deleted file mode 100644
index dd88bee..0000000
--- a/Vagrantfile
+++ /dev/null
@@ -1,86 +0,0 @@
-Vagrant.configure("2") do |config|
-  require 'etc'
-  config.vm.provider "virtualbox" do |vbox|
-    vbox.cpus = [1, Etc.nprocessors].max
-# Change VirtualBox itself's slirp CIDR so that it doesn't conflict with slirp4netns
-    vbox.customize ["modifyvm", :id, "--natnet1", "10.0.200.0/24"]
-  end
-  config.vm.box = "centos/7"
-  config.vm.synced_folder ".", "/vagrant", disabled: true
-  config.vm.synced_folder ".", "/src/slirp4netns", type: "rsync"
-  config.vm.provision "shell",
-    inline: <<~'SHELL'
-      set -xeu
-      sysctl user.max_user_namespaces=65536
-
-      yum install -y \
-        epel-release \
-        https://repo.ius.io/ius-release-el7.rpm
-
-      yum install -y \
-        autoconf automake make gcc gperf libtool \
-        git-core meson ninja-build \
-        glib2-devel libcap-devel \
-        git-core libtool iproute iputils iperf3 nmap jq
-
-      # TODO: install udhcpc (required by test-slirp4netns-dhcp.sh)
-
-      cd /src
-      chown vagrant .
-
-      su vagrant -c '
-        set -xeu
-
-        git clone --depth=1 --no-checkout https://github.com/seccomp/libseccomp
-        git -C ./libseccomp fetch --tags --depth=1
-
-        git clone --depth=1 --no-checkout https://git.qemu.org/libslirp.git
-        git -C ./libslirp fetch --tags --depth=1
-
-        touch ./build-and-test
-        chmod a+x ./build-and-test
-      '
-
-      cat > ./build-and-test <<'EOS'
-      #! /bin/sh
-      set -xeu
-      src_dir='/src'
-
-      prefix="${PREFIX:-${HOME}/prefix}"
-      build_root="${BUILD_ROOT:-${prefix}/build}"
-      rm -rf "${prefix}" "${build_root}"
-      mkdir -p "${build_root}"
-
-      export CFLAGS="-I${prefix}"
-      export LDFLAGS="-L${prefix} -Wl,-rpath,${prefix}/lib"
-      export PKG_CONFIG_PATH="${prefix}/lib/pkgconfig${PKG_CONFIG_PATH:+:${PKG_CONFIG_PATH}}"
-
-      git -C "${src_dir}/libseccomp" fetch --depth=1 origin "${LIBSECCOMP_COMMIT:-v2.4.3}"
-      git -C "${src_dir}/libseccomp" checkout FETCH_HEAD
-      ( cd "${src_dir}/libseccomp" && ./autogen.sh )
-      mkdir "${build_root}/libseccomp"
-      pushd "${build_root}/libseccomp"
-      "${src_dir}/libseccomp/configure" --prefix="${prefix}"
-      make -j "$( nproc )" CFLAGS+="-I$( pwd )/include"
-      make install
-      popd
-
-      git -C "${src_dir}/libslirp" fetch --depth=1 origin "${LIBSLIRP_COMMIT:-v4.1.0}"
-      git -C "${src_dir}/libslirp" checkout FETCH_HEAD
-      mkdir "${build_root}/libslirp"
-      pushd "${build_root}/libslirp"
-      meson setup --prefix="${prefix}" --libdir=lib . "${src_dir}/libslirp"
-      ninja -C . install
-      popd
-
-      ( cd "${src_dir}/slirp4netns" && ./autogen.sh )
-      mkdir "${build_root}/slirp4netns"
-      pushd "${build_root}/slirp4netns"
-      "${src_dir}/slirp4netns/configure" --prefix="${prefix}"
-      make -j "$( nproc )"
-
-      make ci 'CLANGTIDY=echo skipping:' 'CLANGFORMAT=echo skipping:'
-      popd
-      EOS
-    SHELL
-end