diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 1f46927b83..11cd38fb74 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -251,7 +251,7 @@ jobs: diff -u expected_ldd_out.txt ldd_out.txt run-e2e-tests: - name: run-e2e-tests-${{ matrix.arch }} + name: run-e2e-tests-${{ matrix.arch }}-${{ matrix.name }} strategy: fail-fast: false matrix: diff --git a/test/e2e/tests/test_network/test_network.py b/test/e2e/tests/test_network/test_network.py index 53874cba07..08c37ea8e0 100644 --- a/test/e2e/tests/test_network/test_network.py +++ b/test/e2e/tests/test_network/test_network.py @@ -9,7 +9,7 @@ 'image': 'nginx:1.14-alpine', }, 'curl': { - 'image': 'curlimages/curl:8.11.1', + 'image': 'curlimages/curl:8.12.0', 'args': ["sleep", "300"] } } @@ -114,6 +114,6 @@ def test_curl_nginx(sinsp, run_containers: dict): } curl_container.exec_run( - f'curl --local-port {local_port} {destination["ip"]}') + f'curl --ipv4 --local-port {local_port} {destination["ip"]}') assert_events(expected_events(origin, destination), sinsp) diff --git a/test/e2e/tests/test_process/test_container.py b/test/e2e/tests/test_process/test_container.py index b1ffbce9fb..e9d69b833c 100644 --- a/test/e2e/tests/test_process/test_container.py +++ b/test/e2e/tests/test_process/test_container.py @@ -14,7 +14,7 @@ 'http-hello': { 'image': 'hashicorp/http-echo:1.0.0', 'args': ['-text=hello'], - 'user': '11:100' + 'user': '65532:50' } } ] @@ -49,10 +49,10 @@ def test_exec_in_container(sinsp, run_containers: dict): 'evt.type': 'execve', 'proc.exe': '/http-echo', 'proc.cmdline': 'http-echo -text=hello', - 'user.uid': 11, - 'user.name': 'operator', - 'group.gid': 100, - 'group.name': 'users', + 'user.uid': 65532, + 'user.name': 'nonroot', + 'group.gid': 50, + 'group.name': 'staff', }, { 'container.id': container_id, 'evt.category': 'process',