From 54d464f17aefa39d3866947572dd3c2e7519ad2a Mon Sep 17 00:00:00 2001
From: Jan Pazdziora <jpazdziora@redhat.com>
Date: Mon, 15 Feb 2021 08:51:49 +0100
Subject: [PATCH] Workaround
 https://github.com/actions/virtual-environments/issues/2703 and
 https://bugzilla.redhat.com/show_bug.cgi?id=1928643.

---
 .github/workflows/build-test.yaml | 6 ++----
 .travis.yml                       | 9 ---------
 2 files changed, 2 insertions(+), 13 deletions(-)

diff --git a/.github/workflows/build-test.yaml b/.github/workflows/build-test.yaml
index 4fba7877..8ff3fd32 100644
--- a/.github/workflows/build-test.yaml
+++ b/.github/workflows/build-test.yaml
@@ -96,8 +96,6 @@ jobs:
       matrix:
         os: [ fedora-33, centos-8 ]
     steps:
-      - name: Install podman
-        run: . /etc/os-release && echo "deb https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable/xUbuntu_${VERSION_ID}/ /" | sudo tee /etc/apt/sources.list.d/devel:kubic:libcontainers:stable.list && curl -L https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable/xUbuntu_${VERSION_ID}/Release.key | sudo apt-key add - && sudo apt-get update -y && sudo apt-get install -y podman
       - uses: actions/checkout@v2
       - uses: actions/download-artifact@v2
         with:
@@ -119,8 +117,8 @@ jobs:
       matrix:
         os: [ fedora-33, centos-8 ]
     steps:
-      - name: Install podman and others
-        run: . /etc/os-release && echo "deb https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable/xUbuntu_${VERSION_ID}/ /" | sudo tee /etc/apt/sources.list.d/devel:kubic:libcontainers:stable.list && curl -L https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable/xUbuntu_${VERSION_ID}/Release.key | sudo apt-key add - && sudo apt-get update -y && sudo apt-get install -y podman fuse-overlayfs uidmap slirp4netns
+      - name: Install fuse-overlayfs for rootless podman
+        run: . /etc/os-release && echo "deb https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable/xUbuntu_${VERSION_ID}/ /" | sudo tee /etc/apt/sources.list.d/devel:kubic:libcontainers:stable.list && curl -L https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable/xUbuntu_${VERSION_ID}/Release.key | sudo apt-key add - && sudo apt-get update -y && sudo apt-get install -y 'podman=2.2.1~4' fuse-overlayfs
       - uses: actions/checkout@v2
       - uses: actions/download-artifact@v2
         with:
diff --git a/.travis.yml b/.travis.yml
index e93df420..51a6abbd 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -57,18 +57,9 @@ jobs:
       env: dockerfile=fedora-33 readonly=--read-only
       workspaces:
         use: fedora-33
-    - env: dockerfile=fedora-33 docker='sudo podman'
-      workspaces:
-        use: fedora-33
-    - env: dockerfile=fedora-33 docker=podman replica=none
-      workspaces:
-        use: fedora-33
     - env: dockerfile=centos-8 readonly=--read-only
       workspaces:
         use: centos-8
-    - env: dockerfile=centos-8 docker='sudo podman'
-      workspaces:
-        use: centos-8
 
     - &test-k3s
       env: dockerfile=fedora-33