From 5dbb80644d918eabd25258e3d479e79a9c4a65d9 Mon Sep 17 00:00:00 2001 From: KM ANJU <95232459+KMAnju-2021@users.noreply.github.com> Date: Tue, 9 Jul 2024 08:41:33 +0530 Subject: [PATCH] To support running ipv4 e2e tests in Kind (#6463) Signed-off-by: KMAnju-2021 --- CONTRIBUTING.md | 2 ++ ci/jenkins/jobs/projects-lab.yaml | 38 +++++++++++++++++++++++++++++-- 2 files changed, 38 insertions(+), 2 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 16325590c31..979dd5c96a9 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -183,6 +183,7 @@ Here are the trigger phrases for individual checks: * `/test-rancher-e2e`: Linux IPv4 e2e tests on Rancher clusters. * `/test-rancher-conformance`: Linux IPv4 conformance tests on Rancher clusters. * `/test-rancher-networkpolicy`: Linux IPv4 networkpolicy tests on Rancher clusters. +* `/test-kind-e2e`: Linux IPv4 e2e tests on Kind cluster. * `/test-kind-ipv6-e2e`: Linux dual stack e2e tests on Kind cluster. * `/test-kind-ipv6-only-e2e`: Linux IPv6 only e2e tests on Kind cluster. * `/test-kind-conformance`: Linux IPv4 conformance tests on Kind cluster. @@ -195,6 +196,7 @@ Here are the trigger phrases for individual checks: Here are the trigger phrases for groups of checks: * `/test-all`: Linux IPv4 tests +* `/test-kind-all`: Linux IPv4 tests on Kind cluster * `/test-windows-all`: Windows IPv4 tests, including e2e tests with proxyAll enabled. It also includes all containerd runtime based Windows tests since 1.10.0. * `/test-ipv6-all`: Linux dual stack tests * `/test-ipv6-only-all`: Linux IPv6 only tests diff --git a/ci/jenkins/jobs/projects-lab.yaml b/ci/jenkins/jobs/projects-lab.yaml index dc21d2a6ff0..b5b7286ddef 100644 --- a/ci/jenkins/jobs/projects-lab.yaml +++ b/ci/jenkins/jobs/projects-lab.yaml @@ -906,6 +906,38 @@ - text: credential-id: DOCKER_PASSWORD variable: DOCKER_PASSWORD + - '{name}-{test_name}-for-pull-request': + test_name: kind-e2e + node: 'antrea-kind-testbed' + description: 'This is for running e2e tests on kind.' + branches: + - ${{sha1}} + builders: + - builder-e2e-kind: + ip_version: 'ipv4' + kind_cluster_name: '{test_name}' + trigger_phrase: ^(?!Thanks for your PR).*/test-kind-(e2e|all).* + white_list_target_branches: [] + allow_whitelist_orgs_as_admins: true + admin_list: '{antrea_admin_list}' + org_list: '{antrea_org_list}' + white_list: '{antrea_white_list}' + only_trigger_phrase: true + trigger_permit_all: true + throttle_concurrent_builds_enabled: 'true' + status_context: jenkins-kind-e2e + status_url: --none-- + success_status: Build finished. + failure_status: Failed. Add comment /test-kind-e2e to re-trigger. + error_status: Failed. Add comment /test-kind-e2e to re-trigger. + triggered_status: null + started_status: null + wrappers: + - timeout: + fail: true + timeout: 135 + type: absolute + publishers: [] - '{name}-{test_name}-for-pull-request': test_name: kind-conformance node: 'antrea-kind-testbed' @@ -917,7 +949,7 @@ conformance_type: 'conformance' ip_version: 'ipv4' kind_cluster_name: '{test_name}' - trigger_phrase: ^(?!Thanks for your PR).*/test-kind-conformance.* + trigger_phrase: ^(?!Thanks for your PR).*/test-kind-(conformance|all).* white_list_target_branches: [] allow_whitelist_orgs_as_admins: true admin_list: '{antrea_admin_list}' @@ -925,6 +957,7 @@ white_list: '{antrea_white_list}' only_trigger_phrase: true trigger_permit_all: true + throttle_concurrent_builds_enabled: 'true' status_context: jenkins-kind-conformance status_url: --none-- success_status: Build finished. @@ -949,7 +982,7 @@ conformance_type: 'networkpolicy' ip_version: 'ipv4' kind_cluster_name: '{test_name}' - trigger_phrase: ^(?!Thanks for your PR).*/test-kind-networkpolicy.* + trigger_phrase: ^(?!Thanks for your PR).*/test-kind-(networkpolicy|all).* white_list_target_branches: [] allow_whitelist_orgs_as_admins: true admin_list: '{antrea_admin_list}' @@ -957,6 +990,7 @@ white_list: '{antrea_white_list}' only_trigger_phrase: true trigger_permit_all: true + throttle_concurrent_builds_enabled: 'true' status_context: jenkins-kind-networkpolicy status_url: --none-- success_status: Build finished.