Changes for Flexible IPAM e2e tests (#6991)

KMAnju-2021 · web-flow · commit b7e0c38bd976 · 2025-03-03T09:40:26.000+01:00
- add `--skip mode-irrelevant` flag for the Flexible IPAM Kind workflow
  in order to run fewer tests
- remove the Flexible-IPAM builder and job from Jenkins as they are no
  longer used

Signed-off-by: KMAnju-2021 &lt;km074btcse18@igdtuw.ac.in&gt;
diff --git a/.github/workflows/kind.yml b/.github/workflows/kind.yml
@@ -309,6 +309,7 @@ jobs:
           ANTREA_LOG_DIR=$PWD/log ANTREA_COV_DIR=$PWD/test-ipam-e2e-coverage ./ci/kind/test-e2e-kind.sh \
            --encap-mode noEncap \
            --coverage \
+           --skip mode-irrelevant \
            --multicast \
            --flexible-ipam \
       - name: Tar coverage files
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -174,7 +174,6 @@ Here are the trigger phrases for individual checks:
 * `/test-ipv6-only-e2e`: Linux IPv6 only e2e tests
 * `/test-ipv6-only-conformance`: Linux IPv6 only conformance tests
 * `/test-ipv6-only-networkpolicy`: Linux IPv6 only networkpolicy tests
-* `/test-flexible-ipam-e2e`: Flexible IPAM e2e tests
 * `/test-multicast-e2e`: Multicast e2e tests
 * `/test-multicluster-e2e`: Multicluster e2e tests
 * `/test-vm-e2e`: ExternalNode e2e tests
@@ -192,7 +191,6 @@ Here are the trigger phrases for individual checks:
 * `/test-kind-networkpolicy`: Linux IPv4 networkpolicy tests on Kind cluster.
 * `/test-kind-ipv6-only-networkpolicy`: Linux IPv6 only networkpolicy tests on Kind cluster.
 * `/test-kind-ipv6-networkpolicy`: Linux dual stack networkpolicy tests on Kind cluster.
-* `/test-kind-flexible-ipam-e2e`: Flexible IPAM e2e tests on Kind clusters.
 * `/test-kind-all-features-conformance`: Linux IPv4 conformance tests with all features enabled on Kind cluster.
 * `/test-kind-whole-conformance`: Linux All conformance tests on Kind cluster.
 
diff --git a/ci/jenkins/README.md b/ci/jenkins/README.md
@@ -122,15 +122,6 @@ DOCKER_REGISTRY="$(head -n1 ci/docker-registry)"
 ./ci/jenkins/test.sh --testcase multicast-e2e --registry ${DOCKER_REGISTRY}
 ```
 
-* Flexible-ipam e2e: e2e tests in a flexible-ipam cluster
-
-```shell
-#!/bin/bash
-set -e
-DOCKER_REGISTRY="$(head -n1 ci/docker-registry)"
-./ci/jenkins/test.sh --testcase e2e --registry ${DOCKER_REGISTRY} --testbed-type "flexible-ipam"
-```
-
 * Kind conformance: conformance tests in a kind cluster
 
 ```shell
diff --git a/ci/jenkins/jobs/macros.yaml b/ci/jenkins/jobs/macros.yaml
@@ -143,16 +143,6 @@
           [ "$DOCKER_REGISTRY" != "docker.io" ] || ./ci/jenkins/docker_login.sh --docker-user ${{DOCKER_USERNAME}} --docker-password ${{DOCKER_PASSWORD}}
           ./ci/jenkins/test.sh --testcase '{conformance_type}' --registry ${{DOCKER_REGISTRY}} --docker-user ${{DOCKER_USERNAME}} --docker-password ${{DOCKER_PASSWORD}}
 
-- builder:
-    name: builder-flexible-ipam-e2e
-    builders:
-      - shell: |-
-          #!/bin/bash
-          set -e
-          DOCKER_REGISTRY="$(head -n1 ci/docker-registry)"
-          [ "$DOCKER_REGISTRY" != "docker.io" ] || ./ci/jenkins/docker_login.sh --docker-user ${{DOCKER_USERNAME}} --docker-password ${{DOCKER_PASSWORD}}
-          ./ci/jenkins/test.sh --testcase e2e --registry ${{DOCKER_REGISTRY}} --workdir "/home/ubuntu" --kubeconfig "/home/ubuntu/kube.conf" --testbed-type "flexible-ipam"
-
 - builder:
     name: builder-flow-visibility
     builders:
@@ -254,28 +244,6 @@
           ./ci/kind/kind-setup.sh destroy "${{FULL_CLUSTER_NAME}}"
           exit $return_code
                    
-- builder:
-    name: builder-kind-flexible-ipam-e2e
-    builders:
-      - shell: |-
-          #!/bin/bash
-          set -ex
-          DOCKER_REGISTRY="$(head -n1 ci/docker-registry)"
-          KIND_TIMEOUT=135
-          FIRST_VLAN_SUBNET='11=192.168.241.1/24'
-          SECOND_VLAN_SUBNET='12=192.168.242.1/24'
-          FULL_CLUSTER_NAME='{kind_cluster_name}'-"${{BUILD_NUMBER}}"
-          ./ci/kind/kind-setup.sh destroy --all --until ${{KIND_TIMEOUT}}
-          ./ci/kind/kind-install.sh 
-          ./ci/kind/kind-setup.sh --flexible-ipam create "${{FULL_CLUSTER_NAME}}" --vlan-subnets $FIRST_VLAN_SUBNET --vlan-subnets $SECOND_VLAN_SUBNET
-          kind export kubeconfig -n "${{FULL_CLUSTER_NAME}}" --kubeconfig ${{PWD}}/.kube/config
-          set +e
-          ./ci/jenkins/test.sh --testcase e2e --registry ${{DOCKER_REGISTRY}} --kubeconfig ${{PWD}}/.kube/config --testbed-type "kind-flexible-ipam" --kind-cluster-name "${{FULL_CLUSTER_NAME}}"
-          return_code=$?
-          set -e
-          ./ci/kind/kind-setup.sh destroy "${{FULL_CLUSTER_NAME}}"
-          exit $return_code  
-
 - builder:
     name: builder-rancher-e2e
     builders:
diff --git a/ci/jenkins/jobs/projects-cloud.yaml b/ci/jenkins/jobs/projects-cloud.yaml
@@ -1571,43 +1571,6 @@
               default-excludes: true
               fingerprint: false
               only-if-success: false
-      - '{name}-{test_name}-for-pull-request':
-            test_name: kind-flexible-ipam-e2e
-            node: 'kind-flexible-ipam-testbed'
-            description: 'This is the {test_name} test for {name}.'
-            branches:
-            - ${{sha1}}      
-            builders:
-              - builder-kind-flexible-ipam-e2e:
-                  kind_cluster_name: '{test_name}'
-            trigger_phrase: ^(?!Thanks for your PR).*/test-kind-flexible-ipam-e2e.*
-            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
-            status_context: jenkins-kind-flexible-ipam-e2e
-            status_url: null
-            success_status: Build finished.
-            failure_status: Failed. Add comment /test-kind-flexible-ipam-e2e to re-trigger.
-            error_status: Failed. Add comment /test-kind-flexible-ipam-e2e to re-trigger.
-            triggered_status: null
-            started_status: null
-            wrappers:
-            - timeout:
-                fail: true
-                timeout: 135
-                type: absolute
-            publishers:
-            - archive:
-                allow-empty: true
-                artifacts: 'antrea-test-logs.tar.gz'
-                case-sensitive: true
-                default-excludes: true
-                fingerprint: false
-                only-if-success: false
       - 'cloud-{name}-{test_name}-aws-cleanup':
           test_name: sriov-secondary-network
           description: This is for deleting AWS resources for SRIOV secondary-network test.
diff --git a/ci/jenkins/jobs/projects-lab.yaml b/ci/jenkins/jobs/projects-lab.yaml
@@ -46,66 +46,6 @@
               - text:
                   credential-id: RDIFF_PATH
                   variable: RDIFF_PATH
-      - '{name}-{test_name}-no-scm':
-          test_name: flexible-ipam-e2e-pending-label
-          node: null
-          description: 'This is for marking PR as pending for e2e test.'
-          builders:
-            - builder-pending-label
-          trigger_phrase: null
-          white_list_target_branches: []
-          allow_whitelist_orgs_as_admins: true
-          admin_list: []
-          org_list: []
-          white_list: []
-          only_trigger_phrase: false
-          trigger_permit_all: true
-          throttle_concurrent_builds_category:
-          throttle_concurrent_builds_enabled: 'false'
-          status_context: jenkins-flexible-ipam-e2e
-          status_url: --none--
-          success_status: Pending test. Mark as failure. Add comment /test-flexible-ipam-e2e to trigger.
-          failure_status: Pending test. Mark as failure. Add comment /test-flexible-ipam-e2e to trigger.
-          error_status: Pending test. Mark as failure. Add comment /test-flexible-ipam-e2e to trigger.
-          triggered_status: null
-          started_status: null
-          wrappers: []
-          publishers: []
-      - '{name}-{test_name}-for-pull-request':
-          test_name: flexible-ipam-e2e
-          node: 'antrea-flexible-ipam-jumper'
-          description: 'This is the {test_name} test for {name}.'
-          branches:
-          - ${{sha1}}
-          builders:
-            - builder-flexible-ipam-e2e
-          trigger_phrase: ^(?!Thanks for your PR).*/test-flexible-ipam-e2e.*
-          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_category:
-            - e2e-lock-per-testbed
-          throttle_concurrent_builds_enabled: 'true'
-          status_context: jenkins-flexible-ipam-e2e
-          status_url: --none--
-          success_status: Build finished.
-          failure_status: Failed. Add comment /test-flexible-ipam-e2e to re-trigger.
-          error_status: Failed. Add comment /test-flexible-ipam-e2e to re-trigger.
-          triggered_status: null
-          started_status: null
-          wrappers: []
-          publishers:
-          - archive:
-              allow-empty: true
-              artifacts: 'antrea-test-logs.tar.gz'
-              case-sensitive: true
-              default-excludes: true
-              fingerprint: false
-              only-if-success: false
       - '{name}-{test_name}-no-scm':
           test_name: ipv6-ds-e2e-pending-label
           node: null
diff --git a/test/e2e/antreapolicy_test.go b/test/e2e/antreapolicy_test.go
@@ -5468,7 +5468,7 @@ func createPolicyForFQDNCacheMinTTL(t *testing.T, data *TestData, testFQDN strin
 
 	annp, err := data.CreateOrUpdateANNP(builder.Get())
 	require.NoError(t, err, "error while deploying Antrea policy")
-	require.NoError(t, data.waitForANNPRealized(t, annp.Namespace, annp.Name, 30*time.Second))
+	require.NoError(t, data.waitForANNPRealized(t, annp.Namespace, annp.Name, 10*time.Second))
 }
 
 // createHttpAgnhostPod creates an agnhost Pod that serves HTTP requests and returns the IP of Pod created.

Original file line number	Diff line number	Diff line change
`@@ -5468,7 +5468,7 @@ func createPolicyForFQDNCacheMinTTL(t testing.T, data TestData, testFQDN strin`
`5468`	`5468`
`5469`	`5469`	`annp, err := data.CreateOrUpdateANNP(builder.Get())`
`5470`	`5470`	`require.NoError(t, err, "error while deploying Antrea policy")`
`5471`		`- require.NoError(t, data.waitForANNPRealized(t, annp.Namespace, annp.Name, 30*time.Second))`
	`5471`	`+ require.NoError(t, data.waitForANNPRealized(t, annp.Namespace, annp.Name, 10*time.Second))`
`5472`	`5472`	`}`
`5473`	`5473`
`5474`	`5474`	`// createHttpAgnhostPod creates an agnhost Pod that serves HTTP requests and returns the IP of Pod created.`