From b51fb87a447bf30952ad9371ce30dcb1f0410fd5 Mon Sep 17 00:00:00 2001
From: Radostin Stoyanov <rstoyanov@fedoraproject.org>
Date: Wed, 3 Feb 2021 23:01:18 +0000
Subject: [PATCH] ci: move Travis CI Docker tests to GitHub Actions

Travis CI is no longer providing CI minutes for open source projects.

Signed-off-by: Radostin Stoyanov <rstoyanov@fedoraproject.org>
---
 .github/workflows/docker-test.yml | 14 ++++++++++++++
 .travis.yml                       | 13 -------------
 scripts/ci/docker-test.sh         | 12 ++++--------
 3 files changed, 18 insertions(+), 21 deletions(-)
 create mode 100644 .github/workflows/docker-test.yml

diff --git a/.github/workflows/docker-test.yml b/.github/workflows/docker-test.yml
new file mode 100644
index 000000000..701b646fb
--- /dev/null
+++ b/.github/workflows/docker-test.yml
@@ -0,0 +1,14 @@
+name: Docker Test
+
+on: [push, pull_request]
+
+jobs:
+  build:
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        os: [ubuntu-18.04, ubuntu-20.04]
+    steps:
+    - uses: actions/checkout@v2
+    - name: Run Docker Test (${{ matrix.os }})
+      run: sudo make -C scripts/ci docker-test
diff --git a/.travis.yml b/.travis.yml
index b9b5c643a..02180ce49 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -30,19 +30,6 @@ jobs:
       group: edge
       virt: vm
       dist: bionic
-    - os: linux
-      arch: amd64
-      env: TR_ARCH=docker-test
-      dist: bionic
-    - os: linux
-      arch: amd64
-      env: TR_ARCH=docker-test DIST=xenial
-      # On xenial it should be possible to test overlayfs;
-      # broken on the latest bionic kernel
-      dist: xenial
-  allow_failures:
-    - env: TR_ARCH=docker-test
-    - env: TR_ARCH=docker-test DIST=xenial
 script:
   - sudo make CCACHE=1 -C scripts/ci $TR_ARCH
 after_success:
diff --git a/scripts/ci/docker-test.sh b/scripts/ci/docker-test.sh
index e42e96569..68edfb36b 100755
--- a/scripts/ci/docker-test.sh
+++ b/scripts/ci/docker-test.sh
@@ -21,14 +21,10 @@ add-apt-repository \
 
 . /etc/lsb-release
 
-if [ "$DISTRIB_RELEASE" = "18.04" ]; then
-    # overlayfs behaves differently on Ubuntu (18.04) and breaks CRIU
-    # https://bugs.launchpad.net/ubuntu/+source/linux/+bug/1857257
-    # Switch to devicemapper
-    echo '{ "experimental": true, "storage-driver": "devicemapper" }' > /etc/docker/daemon.json
-else
-    echo '{ "experimental": true }' > /etc/docker/daemon.json
-fi
+# overlayfs behaves differently on Ubuntu (18.04) and breaks CRIU
+# https://bugs.launchpad.net/ubuntu/+source/linux/+bug/1857257
+# Switch to devicemapper
+echo '{ "experimental": true, "storage-driver": "devicemapper" }' > /etc/docker/daemon.json
 
 service docker restart