Change flag

Signed-off-by: Qiyue Yao <[email protected]>
antrea-io · Sep 21, 2023 · cdf0e87 · cdf0e87
1 parent dd545f4
commit cdf0e87
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 14 deletions.
diff --git a/ci/kind/test-e2e-kind.sh b/ci/kind/test-e2e-kind.sh
@@ -34,7 +34,6 @@ _usage="Usage: $0 [--encap-mode <mode>] [--ip-family <v4|v6>] [--coverage] [--he
         --flow-visibility             Only run flow visibility related e2e tests.
         --extra-network               Creates an extra network that worker Nodes will connect to. Cannot be specified with the hybrid mode.
         --skip                        A comma-separated list of keywords, with which tests should be skipped.
-        --extended                    Enables extended tests to run.
         --coverage                    Enables measure Antrea code coverage when run e2e tests on kind.
         --setup-only                  Only perform setting up the cluster and run test.
         --cleanup-only                Only perform cleaning up the cluster.
@@ -75,7 +74,6 @@ flow_visibility=false
 extra_network=false
 coverage=false
 skiplist=""
-extended_args=""
 setup_only=false
 cleanup_only=false
 test_only=false

diff --git a/test/e2e/antreapolicy_test.go b/test/e2e/antreapolicy_test.go
@@ -4457,13 +4457,13 @@ func TestAntreaPolicy(t *testing.T) {
 		t.Run("Case=ACNPNodePortServiceSupport", func(t *testing.T) { testACNPNodePortServiceSupport(t, data, data.testNamespace) })
 	})
 	t.Run("ExtendedTestGroupANNP", func(t *testing.T) {
-		skipIfNoExtendedTests(t)
+		skipIfNotRequired(t, "mode-irrelevant")
 		t.Run("Case=ANNPDropIngressEgressTCP", func(t *testing.T) { testANNPDropIngressEgress(t, ProtocolTCP) })
 		t.Run("Case=ANNPDropIngressEgressUDP", func(t *testing.T) { testANNPDropIngressEgress(t, ProtocolUDP) })
 		t.Run("Case=ANNPDropIngressEgressSCTP", func(t *testing.T) { testANNPDropIngressEgress(t, ProtocolSCTP) })
-		t.Run("Case=ANNPMultipleAppliedToTCP", func(t *testing.T) { testANNPMultipleRulesAppliedTo(t, ProtocolTCP) })
-		t.Run("Case=ANNPMultipleAppliedToUDP", func(t *testing.T) { testANNPMultipleRulesAppliedTo(t, ProtocolUDP) })
-		t.Run("Case=ANNPMultipleAppliedToSCTP", func(t *testing.T) { testANNPMultipleRulesAppliedTo(t, ProtocolSCTP) })
+		t.Run("Case=ANNPMultipleRulesAppliedToTCP", func(t *testing.T) { testANNPMultipleRulesAppliedTo(t, ProtocolTCP) })
+		t.Run("Case=ANNPMultipleRulesAppliedToUDP", func(t *testing.T) { testANNPMultipleRulesAppliedTo(t, ProtocolUDP) })
+		t.Run("Case=ANNPMultipleRulesAppliedToSCTP", func(t *testing.T) { testANNPMultipleRulesAppliedTo(t, ProtocolSCTP) })
 	})
 	// print results for reachability tests
 	printResults()

diff --git a/test/e2e/fixtures.go b/test/e2e/fixtures.go
@@ -75,12 +75,6 @@ func skipIfNotRequired(tb testing.TB, keys ...string) {
 	}
 }
 
-func skipIfNoExtendedTests(tb testing.TB) {
-	if !testOptions.extendedCases {
-		tb.Skipf("Skipping extended tests when not required")
-	}
-}
-
 func skipIfNumNodesLessThan(tb testing.TB, required int) {
 	if clusterInfo.numNodes < required {
 		tb.Skipf("Skipping test as it requires %d different Nodes but cluster only has %d", required, clusterInfo.numNodes)

diff --git a/test/e2e/framework.go b/test/e2e/framework.go
@@ -199,7 +199,6 @@ type TestOptions struct {
 	flowVisibility      bool
 	coverageDir         string
 	skipCases           string
-	extendedCases       bool
 	linuxVMs            string
 	windowsVMs          string
 	// deployAntrea determines whether to deploy Antrea before running tests. It requires antrea.yml to be present in

diff --git a/test/e2e/main_test.go b/test/e2e/main_test.go
@@ -93,7 +93,6 @@ func testMain(m *testing.M) int {
 	flag.BoolVar(&testOptions.deployAntrea, "deploy-antrea", true, "Deploy Antrea before running tests")
 	flag.StringVar(&testOptions.coverageDir, "coverage-dir", "", "Directory for coverage data files")
 	flag.StringVar(&testOptions.skipCases, "skip", "", "Key words to skip cases")
-	flag.BoolVar(&testOptions.extendedCases, "extended", false, "Run extended tests")
 	flag.StringVar(&testOptions.linuxVMs, "linuxVMs", "", "hostname of Linux VMs")
 	flag.StringVar(&testOptions.windowsVMs, "windowsVMs", "", "hostname of Windows VMs")
 	flag.Parse()