Skip to content

Commit

Permalink
Revert "Workaround actions/runner-images#2703
Browse files Browse the repository at this point in the history
and https://bugzilla.redhat.com/show_bug.cgi?id=1928643."

This reverts commit 54d464f.

Package dependencies got fixed and podman 3.0.1 fixes 1928643.
  • Loading branch information
adelton committed Feb 19, 2021
1 parent 691914d commit 0f4fe17
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 2 deletions.
6 changes: 4 additions & 2 deletions .github/workflows/build-test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,8 @@ 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:
Expand All @@ -117,8 +119,8 @@ jobs:
matrix:
os: [ fedora-33, centos-8 ]
steps:
- 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
- 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
- uses: actions/checkout@v2
- uses: actions/download-artifact@v2
with:
Expand Down
9 changes: 9 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -57,9 +57,18 @@ 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
Expand Down

0 comments on commit 0f4fe17

Please sign in to comment.