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

test(e2e): reenable amd64 self-hosted runners (backport of #11937) #12268

Merged
merged 7 commits into from
Dec 16, 2024
Merged

test(e2e): reenable amd64 self-hosted runners (backport of #11937) #12268

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
af28595
test(e2e): reenable amd64 self-hosted runners (#11937)
jakubdyszkiewicz Oct 30, 2024
9cc6d55
resolve
lukidzi Dec 13, 2024
7371f58
Update e2e.yaml
lukidzi Dec 13, 2024
f12c0d7
Support setting e2e runners from build-test-distribute
jijiechen Dec 16, 2024
e9c5e54
don't use env in matrix value
jijiechen Dec 16, 2024
e39b7fd
remove usage of circleCIToken from e2e.yaml
jijiechen Dec 16, 2024
970afb8
allow dns itmeout
lukidzi Dec 16, 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
8 changes: 4 additions & 4 deletions .github/workflows/build-test-distribute.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -272,8 +272,8 @@ jobs:
uses: ./.github/workflows/e2e.yaml
with:
matrix: ${{ toJSON(matrix) }}
secrets:
circleCIToken: ${{ secrets.CIRCLECI_TOKEN }}
# can't use env here, make sure change other copies when making changes
runnersByArch: ${{ (github.event_name == 'push' || github.event_name == 'pull_request' && github.event.pull_request.head.repo.full_name == github.repository) && '{"amd64":"ubuntu-latest-kong","arm64":"ubuntu-latest-arm64-kong"}' || '{"amd64":"ubuntu-latest","arm64":""}' }}
test_e2e_env:
needs: ["gen_e2e_matrix"]
if: fromJSON(needs.gen_e2e_matrix.outputs.matrix).test_e2e_env
Expand All @@ -283,5 +283,5 @@ jobs:
uses: ./.github/workflows/e2e.yaml
with:
matrix: ${{ toJSON(matrix) }}
secrets:
circleCIToken: ${{ secrets.CIRCLECI_TOKEN }}
# can't use env here, make sure change other copies when making changes
runnersByArch: ${{ (github.event_name == 'push' || github.event_name == 'pull_request' && github.event.pull_request.head.repo.full_name == github.repository) && '{"amd64":"ubuntu-latest-kong","arm64":"ubuntu-latest-arm64-kong"}' || '{"amd64":"ubuntu-latest","arm64":""}' }}
8 changes: 2 additions & 6 deletions .github/workflows/e2e.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,6 @@ on:
type: string
required: false
default: '{"amd64": "ubuntu-latest", "arm64": "ubuntu-latest-arm64-kong"}'
secrets:
circleCIToken:
required: true
permissions:
contents: read
env:
Expand All @@ -23,8 +20,8 @@ env:
E2E_PARAM_PARALLELISM: ${{ fromJSON(inputs.matrix).parallelism }}
jobs:
e2e:
# use the runner from the map, if the runner is circleci or '' then use ubuntu-latest
runs-on: ${{ contains(fromJSON('["circleci", ""]'), fromJSON(inputs.runnersByArch)[fromJSON(inputs.matrix).arch]) && 'ubuntu-latest' || fromJSON(inputs.runnersByArch)[fromJSON(inputs.matrix).arch]}}
runs-on: ${{ fromJSON(inputs.runnersByArch)[fromJSON(inputs.matrix).arch] }}
if: ${{ fromJSON(inputs.runnersByArch)[fromJSON(inputs.matrix).arch] != '' }}
strategy:
fail-fast: false
matrix:
Expand Down Expand Up @@ -75,7 +72,6 @@ jobs:
{
"ipv6": true,
"fixed-cidr-v6": "2001:db8:1::/64",
"dns": ["8.8.8.8"],
"dns-search": ["."]
}
EOF
Expand Down
2 changes: 1 addition & 1 deletion test/e2e/reachableservices/auto_reachable_services_k8s.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ spec:
client.FromKubernetesPod(TestNamespace, "client-server"),
)
g.Expect(err).To(Not(HaveOccurred()))
g.Expect(failures.Exitcode).To(Equal(6))
g.Expect(failures.Exitcode).To(Or(Equal(6), Equal(28)))
}, "30s", "1s").Should(Succeed())

// when
Expand Down
Loading