Skip to content

Commit 59ad5a7

Browse files
authored
Merge pull request #1512 from fluxcd/gha-arm64
Run ARM64 tests on GitHub runners
2 parents 09575db + 7e70497 commit 59ad5a7

File tree

2 files changed

+3
-56
lines changed

2 files changed

+3
-56
lines changed

.github/workflows/e2e.yaml

-43
Original file line numberDiff line numberDiff line change
@@ -51,46 +51,3 @@ jobs:
5151
continue-on-error: true
5252
run: |
5353
kubectl -n source-system logs -l app=source-controller
54-
55-
kind-linux-arm64:
56-
# Hosted on Equinix
57-
# Docs: https://github.com/fluxcd/flux2/tree/main/.github/runners
58-
runs-on: [self-hosted, Linux, ARM64, equinix]
59-
if: (github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == github.repository) && github.actor != 'dependabot[bot]'
60-
steps:
61-
- name: Checkout
62-
uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6
63-
- name: Setup Go
64-
uses: actions/setup-go@cdcb36043654635271a94b9a6d1392de5bb323a7 # v5.0.1
65-
with:
66-
go-version-file: 'go.mod'
67-
cache-dependency-path: |
68-
**/go.sum
69-
**/go.mod
70-
- name: Enable integration tests
71-
# Only run integration tests for main and release branches
72-
if: github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/heads/release/')
73-
run: |
74-
echo 'GO_TAGS=integration' >> $GITHUB_ENV
75-
- name: Prepare
76-
id: prep
77-
run: |
78-
echo "CLUSTER=arm64-${GITHUB_SHA:0:7}-$(date +%s)" >> $GITHUB_OUTPUT
79-
echo "CONTEXT=kind-arm64-${GITHUB_SHA:0:7}-$(date +%s)" >> $GITHUB_OUTPUT
80-
- name: Setup Kubernetes Kind
81-
run: |
82-
kind create cluster --name ${{ steps.prep.outputs.CLUSTER }} --kubeconfig=/tmp/${{ steps.prep.outputs.CLUSTER }}
83-
- name: Run e2e tests
84-
env:
85-
SKIP_COSIGN_VERIFICATION: true
86-
KIND_CLUSTER_NAME: ${{ steps.prep.outputs.CLUSTER }}
87-
KUBECONFIG: /tmp/${{ steps.prep.outputs.CLUSTER }}
88-
CREATE_CLUSTER: false
89-
BUILD_PLATFORM: linux/arm64
90-
MINIO_TAG: RELEASE.2020-09-17T04-49-20Z-arm64
91-
run: make e2e
92-
- name: Cleanup
93-
if: always()
94-
run: |
95-
kind delete cluster --name ${{ steps.prep.outputs.CLUSTER }}
96-
rm /tmp/${{ steps.prep.outputs.CLUSTER }}

.github/workflows/tests.yaml

+3-13
Original file line numberDiff line numberDiff line change
@@ -36,10 +36,9 @@ jobs:
3636
run: make test
3737

3838
test-linux-arm64:
39-
# Hosted on Equinix
40-
# Docs: https://github.com/fluxcd/flux2/tree/main/.github/runners
41-
runs-on: [self-hosted, Linux, ARM64, equinix]
42-
if: (github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == github.repository) && github.actor != 'dependabot[bot]'
39+
runs-on:
40+
group: "ARM64"
41+
if: github.actor != 'dependabot[bot]'
4342
steps:
4443
- name: Checkout
4544
uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6
@@ -53,15 +52,6 @@ jobs:
5352
- name: Run tests
5453
env:
5554
SKIP_COSIGN_VERIFICATION: true
56-
5755
TEST_AZURE_ACCOUNT_NAME: ${{ secrets.TEST_AZURE_ACCOUNT_NAME }}
5856
TEST_AZURE_ACCOUNT_KEY: ${{ secrets.TEST_AZURE_ACCOUNT_KEY }}
59-
60-
# Temporarily disabling -race for arm64 as our GitHub action
61-
# runners don't seem to like it. The race detection was tested
62-
# on both Apple M1 and Linux arm64 with successful results.
63-
#
64-
# We should reenable go test -race for arm64 runners once the
65-
# current issue is resolved.
66-
GO_TEST_ARGS: ''
6757
run: make test

0 commit comments

Comments
 (0)