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

Jump to bottom

ci: replace buildjet arm64 runners with actuated ones #1682

Merged
merged 2 commits into from
Dec 1, 2023
Merged

ci: replace buildjet arm64 runners with actuated ones #1682

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
326a62b
verify.sh: add conditional checks on kernel version
mtardy Dec 1, 2023
f50245e
ci: replace buildjet arm64 runners with actuated ones
mtardy Oct 31, 2023
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
6 changes: 4 additions & 2 deletions .github/workflows/gotests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
strategy:
fail-fast: false
matrix:
os: [ ubuntu-20.04, buildjet-2vcpu-ubuntu-2204-arm ]
os: [ ubuntu-20.04, actuated-arm64-4cpu-8gb ]
steps:
- name: Checkout code
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
Expand All @@ -29,7 +29,7 @@ jobs:

- name: Install dependencies
run: |
sudo apt-get install libelf-dev netcat-traditional libcap-dev gcc
sudo apt-get -y install libelf-dev netcat-traditional libcap-dev gcc

sudo sed -i '/secure_path/d' /etc/sudoers
sudo sed -i '/env_reset/d' /etc/sudoers
Expand All @@ -40,6 +40,8 @@ jobs:

- name: Install bpftool
uses: mtardy/setup-bpftool@adeab4f9332cc28db56064a93911860d0775665b # v1.0.3
with:
token: ${{ secrets.GITHUB_TOKEN }}

- name: Ensure BPF programs pass verifier
run: |
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/run-e2e-tests.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,9 @@ jobs:
runs-on: ${{ matrix.os }}
timeout-minutes: 40
strategy:
fail-fast: false
matrix:
os: [ ubuntu-22.04, buildjet-4vcpu-ubuntu-2204-arm ]
os: [ ubuntu-22.04, actuated-arm64-4cpu-16gb ]
steps:
- name: Checkout Code
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
Expand Down
18 changes: 12 additions & 6 deletions contrib/verify/verify.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ GREEN="\033[32m"
NOCOLOR="\033[0m"
TETRAGONDIR=/var/lib/tetragon
DEBUG=0
KERNEL=$(uname -r | cut -d. -f1,2) # retrieves major.minor, e.g. 5.19

usage() {
echo "usage: verify.sh [-d] [TETRAGONDIR]"
Expand Down Expand Up @@ -42,28 +43,33 @@ STATUS=0
for obj in "$TETRAGONDIR"/*.o; do
B=$(basename "$obj")

# Alignchecker is not a bpf program, so ignore it
# Alignchecker is not a bpf program, so ignore it
if [[ "$B" == bpf_alignchecker* ]]; then
continue
fi

# Globals is just for testing, so ignore it
# Globals is just for testing, so ignore it
if [[ "$B" == bpf_globals* ]]; then
continue
fi

# Generic tracepoint needs more complex userspace logic to load, so ignore it
# Generic tracepoint needs more complex userspace logic to load, so ignore it
if [[ "$B" == bpf_generic_tracepoint* ]]; then
continue
fi

# Multi kprobe support is still not widely around, skip the object
# Multi kprobe support is still not widely around, skip the object
if [[ "$B" == bpf_multi_* ]]; then
continue
fi

# skip v6.0 objects check, because it is still not widely around
if [[ "$B" == *61.o ]]; then
# Skip v6.1 objects check for kernel < 6.1
if [[ "$B" == *61.o && $(echo "$KERNEL < 6.1" | bc) == 1 ]]; then
continue
fi

# Skip bpf_loader for kernel < 5.19
if [[ "$B" == bpf_loader* && $(echo "$KERNEL < 5.19" | bc) == 1 ]]; then
continue
fi

Expand Down
Loading