Skip to content

Commit 9def7d9

Browse files
authored
Update e2e-main.yaml
1 parent 79a69cf commit 9def7d9

File tree

1 file changed

+22
-13
lines changed

1 file changed

+22
-13
lines changed

.github/workflows/e2e-main.yaml

+22-13
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,10 @@
1818
name: e2e-tests-main
1919

2020
on:
21-
push:
22-
branches: [main]
23-
21+
workflow_run:
22+
workflows: ["CI"]
23+
types:
24+
- completed
2425
workflow_dispatch:
2526
inputs:
2627
organization:
@@ -42,7 +43,8 @@ on:
4243
jobs:
4344
e2e-tests:
4445
name: Red Hat Account Extension E2E tests
45-
runs-on: ubuntu-22.04
46+
runs-on: ubuntu-24.04
47+
if: github.event_name == 'workflow_dispatch'
4648
steps:
4749

4850
- uses: actions/checkout@v4
@@ -85,21 +87,28 @@ jobs:
8587
node-version: 20
8688
cache: 'pnpm'
8789

88-
- name: Update podman
90+
- name: Update podman v. 5.x
8991
run: |
90-
sudo sh -c "echo 'deb https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/unstable/xUbuntu_22.04/ /' > /etc/apt/sources.list.d/devel:kubic:libcontainers:unstable.list"
91-
curl -L "https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable/xUbuntu_22.04/Release.key" | sudo apt-key add -
92+
# ubuntu version from kubic repository to install podman we need (v5)
93+
ubuntu_version='23.04'
94+
sudo sh -c "echo 'deb https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/unstable/xUbuntu_${ubuntu_version}/ /' > /etc/apt/sources.list.d/devel:kubic:libcontainers:unstable.list"
95+
curl -L "https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/unstable/xUbuntu_${ubuntu_version}/Release.key" | sudo apt-key add -
96+
# install necessary dependencies for criu package which is not part of 23.04
97+
sudo apt-get install -qq libprotobuf32t64 python3-protobuf libnet1
98+
# install criu manually from static location
99+
curl -sLO http://cz.archive.ubuntu.com/ubuntu/pool/universe/c/criu/criu_3.16.1-2_amd64.deb && sudo dpkg -i criu_3.16.1-2_amd64.deb
92100
sudo apt-get update -qq
93101
sudo apt-get -qq -y install podman || { echo "Start fallback steps for podman nightly installation from a static mirror" && \
94-
sudo sh -c "echo 'deb http://ftp.lysator.liu.se/pub/opensuse/repositories/devel:/kubic:/libcontainers:/unstable/xUbuntu_22.04/ /' > /etc/apt/sources.list.d/devel:kubic:libcontainers:unstable.list" && \
95-
curl -L "http://ftp.lysator.liu.se/pub/opensuse/repositories/devel:/kubic:/libcontainers:/stable/xUbuntu_22.04/Release.key" | sudo apt-key add - && \
102+
sudo sh -c "echo 'deb http://ftp.lysator.liu.se/pub/opensuse/repositories/devel:/kubic:/libcontainers:/unstable/xUbuntu_${ubuntu_version}/ /' > /etc/apt/sources.list.d/devel:kubic:libcontainers:unstable.list" && \
103+
curl -L "http://ftp.lysator.liu.se/pub/opensuse/repositories/devel:/kubic:/libcontainers:/unstable/xUbuntu_${ubuntu_version}/Release.key" | sudo apt-key add - && \
96104
sudo apt-get update && \
97105
sudo apt-get -y install podman; }
98106
podman version
99-
# downgrade conmon package version to workaround issue with starting containers, see https://github.com/containers/conmon/issues/475
100-
# remove once the repository contains conmon 2.1.10
101-
wget https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable/xUbuntu_22.04/amd64/conmon_2.1.2~0_amd64.deb -O /tmp/conmon_2.1.2.deb
102-
sudo apt install /tmp/conmon_2.1.2.deb
107+
108+
- name: Revert unprivileged user namespace restrictions in Ubuntu 24.04
109+
run: |
110+
# allow unprivileged user namespace
111+
sudo sysctl -w kernel.apparmor_restrict_unprivileged_userns=0
103112
104113
- name: Build Podman Desktop for E2E tests
105114
working-directory: ./podman-desktop

0 commit comments

Comments
 (0)