diff --git a/.github/workflows/pr-ci.yaml b/.github/workflows/pr-ci.yaml index bbd194c1d..01ed11607 100644 --- a/.github/workflows/pr-ci.yaml +++ b/.github/workflows/pr-ci.yaml @@ -9,10 +9,6 @@ on: types: - created -env: - OPENSUSE_UNOFFICIAL_LIBCONTAINERS_KEY_URL: "https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/unstable/xUbuntu_22.04/Release.key" - OPENSUSE_UNOFFICIAL_LIBCONTAINERS_SOURCE_URL: "https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/unstable/xUbuntu_22.04" - jobs: check-before-build: runs-on: ubuntu-latest @@ -134,18 +130,12 @@ jobs: cd src/main/webui yarn install && yarn yarn:frzinstall cd - + - name: Add CRIU PPA + run: sudo add-apt-repository ppa:criu/ppa && sudo apt update - name: Install podman v4 run: | - echo "deb $OPENSUSE_UNOFFICIAL_LIBCONTAINERS_SOURCE_URL/ /" | sudo tee /etc/apt/sources.list.d/devel:kubic:libcontainers:unstable.list - curl -fsSL $OPENSUSE_UNOFFICIAL_LIBCONTAINERS_KEY_URL | gpg --dearmor | sudo tee /etc/apt/trusted.gpg.d/devel_kubic_libcontainers_unstable.gpg > /dev/null sudo apt -y purge podman - sudo apt update && sudo apt -y install podman - - name: Emulate docker with podman - run: | - mkdir -p $HOME/.bin - cat <(echo '#!/usr/bin/env bash') <(echo 'exec podman "$@"') > $HOME/.bin/docker - chmod +x $HOME/.bin/docker - echo "PATH=$HOME/.bin:$PATH" >> "$GITHUB_ENV" + sudo apt update && sudo apt -y satisfy "podman (>= 4.0), podman-docker" - name: Set up testcontainers for podman run: | echo ryuk.container.privileged=true > ~/.testcontainers.properties diff --git a/.github/workflows/push-ci.yaml b/.github/workflows/push-ci.yaml index e7b335fd3..09b1d6e2e 100644 --- a/.github/workflows/push-ci.yaml +++ b/.github/workflows/push-ci.yaml @@ -16,8 +16,6 @@ on: - cryostat-v[0-9]+.[0-9]+ env: - OPENSUSE_UNOFFICIAL_LIBCONTAINERS_KEY_URL: "https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/unstable/xUbuntu_22.04/Release.key" - OPENSUSE_UNOFFICIAL_LIBCONTAINERS_SOURCE_URL: "https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/unstable/xUbuntu_22.04" CI_USER: cryostat+bot CI_REGISTRY: quay.io/cryostat CI_IMG: quay.io/cryostat/cryostat @@ -55,10 +53,12 @@ jobs: contents: read if: ${{ github.repository_owner == 'cryostatio' }} steps: - - name: Install qemu + - name: Add CRIU PPA + run: sudo add-apt-repository ppa:criu/ppa && sudo apt update + - name: Install podman 4 and qemu run: | sudo apt-get update - sudo apt-get install -y qemu-user-static + sudo apt -y satisfy "podman (>= 4.0), qemu-user-static, podman-docker" - uses: actions/checkout@v3 with: submodules: true @@ -83,18 +83,6 @@ jobs: cd src/main/webui yarn install && yarn yarn:frzinstall cd - - - name: Install podman v4 - run: | - echo "deb $OPENSUSE_UNOFFICIAL_LIBCONTAINERS_SOURCE_URL/ /" | sudo tee /etc/apt/sources.list.d/devel:kubic:libcontainers:unstable.list - curl -fsSL $OPENSUSE_UNOFFICIAL_LIBCONTAINERS_KEY_URL | gpg --dearmor | sudo tee /etc/apt/trusted.gpg.d/devel_kubic_libcontainers_unstable.gpg > /dev/null - sudo apt -y purge podman - sudo apt update && sudo apt -y install podman - - name: Emulate docker with podman - run: | - mkdir -p $HOME/.bin - cat <(echo '#!/usr/bin/env bash') <(echo 'exec podman "$@"') > $HOME/.bin/docker - chmod +x $HOME/.bin/docker - echo "PATH=$HOME/.bin:$PATH" >> "$GITHUB_ENV" - name: Set up testcontainers for podman run: | echo ryuk.container.privileged=true > ~/.testcontainers.properties