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

workflows: use GitHub arm64 runners instead of actuated #3034

Merged
merged 2 commits into from
Oct 31, 2024
Merged

workflows: use GitHub arm64 runners instead of actuated #3034

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
c1743d7
workflows: use GitHub arm64 runners instead of actuated
mtardy Oct 23, 2024
83bcdf3
e2e tests: skip label test on ARM
kkourt Oct 31, 2024
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
3 changes: 2 additions & 1 deletion .github/workflows/bpf-unit-tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ on:
pull_request:
paths:
- 'bpf/**'
- '.github/workflows/bpf-unit-tests.yml'
push:
branches:
- main
Expand All @@ -14,7 +15,7 @@ jobs:
runs-on: ${{ matrix.os }}
strategy:
matrix:
os: [ ubuntu-22.04, actuated-arm64-4cpu-8gb ]
os: [ ubuntu-22.04, ubuntu-22.04-arm64 ]
steps:
- name: Checkout code
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
Expand Down
4 changes: 2 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, actuated-arm64-4cpu-8gb ]
os: [ ubuntu-20.04, ubuntu-22.04-arm64 ]
steps:
- name: Checkout code
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
Expand Down Expand Up @@ -49,7 +49,7 @@ jobs:
- name: Install dependencies ARM
run: |
sudo apt-get -y install gcc-arm-linux-gnueabihf
if: ${{ matrix.os == 'actuated-arm64-4cpu-8gb' }}
if: ${{ matrix.os == 'ubuntu-22.04-arm64' }}

- name: Install bpftool
uses: mtardy/setup-bpftool@adeab4f9332cc28db56064a93911860d0775665b # v1.0.3
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/packages-e2e-tests.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ jobs:
match_arch: x86-64
cross_compile: no
upload_path: upload/
- os: actuated-arm64-4cpu-8gb
- os: ubuntu-22.04-arm64
arch: arm64
match_arch: arm64
cross_compile: yes
Expand Down
5 changes: 3 additions & 2 deletions .github/workflows/run-e2e-tests.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ jobs:
strategy:
fail-fast: false
matrix:
os: [ ubuntu-22.04, actuated-arm64-4cpu-16gb ]
os: [ ubuntu-22.04, ubuntu-22.04-arm64 ]
package: ${{fromJson(needs.prepare.outputs.packages)}}
steps:
- name: Checkout Code
Expand Down Expand Up @@ -111,9 +111,10 @@ jobs:
docker pull ${{ needs.prepare.outputs.operatorImage }}

- name: Run e2e Tests
env:
GHA_OS: ${{matrix.os}}
run: |
cd go/src/github.com/cilium/tetragon

make e2e-test E2E_TESTS=${{matrix.package.f}} E2E_BUILD_IMAGES=0 E2E_AGENT=${{ needs.prepare.outputs.agentImage }} E2E_OPERATOR=${{ needs.prepare.outputs.operatorImage }} EXTRA_TESTFLAGS="-cluster-name=${{ env.clusterName }} -args -v=4"

- name: Upload Tetragon Logs
Expand Down
5 changes: 5 additions & 0 deletions tests/e2e/tests/labels/labels_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ package labels_test
import (
"context"
"fmt"
"os"
"testing"
"time"

Expand Down Expand Up @@ -95,6 +96,10 @@ func TestMain(m *testing.M) {
}

func TestLabelsDemoApp(t *testing.T) {
if os.Getenv("GHA_OS") == "ubuntu-22.04-arm64" {
t.Skip("Skipping, see: ://github.com/cilium/tetragon/issues/3060")
}

// Must be called at the beginning of every test
runner.SetupExport(t)

Expand Down
Loading