Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

wip: chore(ci): port e2e tests CI to arm64 too. #2263

Closed
wants to merge 3 commits into from
Closed

wip: chore(ci): port e2e tests CI to arm64 too. #2263

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
14df460
chore(ci): port e2e tests CI to arm64 too.
FedeDP Jan 31, 2025
8330933
fix(test/e2e): use multiarch docker images for curl and http-hello.
FedeDP Jan 31, 2025
fbb168b
wip
FedeDP Feb 6, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -250,11 +250,12 @@ jobs:
EOF
diff -u expected_ldd_out.txt ldd_out.txt

run-e2e-tests-amd64:
name: run-e2e-tests-amd64
run-e2e-tests:
name: run-e2e-tests-${{ matrix.arch }}-${{ matrix.name }}
strategy:
fail-fast: false
matrix:
arch: [amd64, arm64]
name: [system_deps, bundled_deps, asan]
include:
- name: system_deps
Expand All @@ -263,7 +264,7 @@ jobs:
cmake_opts: -DUSE_BUNDLED_DEPS=True
- name: asan
cmake_opts: -DUSE_BUNDLED_DEPS=True -DCMAKE_C_FLAGS=-fsanitize=address -DCMAKE_CXX_FLAGS=-fsanitize=address
runs-on: ubuntu-22.04
runs-on: ${{ (matrix.arch == 'arm64' && 'ubuntu-22.04-arm') || 'ubuntu-22.04' }}
steps:
- name: Install deps ⛓️
run: |
Expand Down Expand Up @@ -334,7 +335,7 @@ jobs:
uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0
if: failure()
with:
name: ${{ matrix.name }}_report
name: ${{ matrix.name }}_report-${{ matrix.arch }}
path: |
/tmp/report/

Expand Down
2 changes: 1 addition & 1 deletion test/e2e/tests/test_network/test_network.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
'image': 'nginx:1.14-alpine',
},
'curl': {
'image': 'pstauffer/curl:latest',
'image': 'curlimages/curl:8.12.0',
'args': ["sleep", "300"]
}
}
Expand Down
19 changes: 6 additions & 13 deletions test/e2e/tests/test_process/test_container.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@
containers = [
{
'http-hello': {
'image': 'hashicorp/http-echo:alpine',
'image': 'hashicorp/http-echo:1.0.0',
'args': ['-text=hello'],
'user': '11:100'
'user': '65532:50'
}
}
]
Expand All @@ -32,7 +32,6 @@ def test_exec_in_container(sinsp, run_containers: dict):

container_id = get_container_id(app_container)

app_container.exec_run("sleep 5")
app_container.exec_run("sh -c ls")

expected_events = [
Expand All @@ -49,16 +48,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',
}, {
'container.id': container_id,
'evt.category': 'process',
'evt.type': 'execve',
'proc.exe': 'sleep',
'proc.cmdline': 'sleep 5'
'user.uid': 65532,
'user.name': 'nonroot',
'group.gid': 50,
'group.name': 'staff',
}, {
'container.id': container_id,
'evt.category': 'process',
Expand Down
Loading