From adcbd42cabfa42a71410dd0c76ece0f367d338fd Mon Sep 17 00:00:00 2001
From: Cédric Ollivier <cedric.ollivier@orange.com>
Date: Sun, 4 Apr 2021 12:01:15 +0200
Subject: Merge sig_network_features in sig_network
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Change-Id: I33516a7b0f280355c40aa821738a0625e4fae93a
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
---
 ansible/site.yml            |  1 -
 docker/smoke/testcases.yaml | 31 ++++---------------------------
 2 files changed, 4 insertions(+), 28 deletions(-)

diff --git a/ansible/site.yml b/ansible/site.yml
index c867bfa7..b1260299 100644
--- a/ansible/site.yml
+++ b/ansible/site.yml
@@ -24,7 +24,6 @@
             - sig_cluster_lifecycle
             - sig_instrumentation
             - sig_network
-            - sig_network_features
             - sig_node
             - sig_storage
         - container: functest-kubernetes-security
diff --git a/docker/smoke/testcases.yaml b/docker/smoke/testcases.yaml
index 51fb64ad..ba6c23f1 100644
--- a/docker/smoke/testcases.yaml
+++ b/docker/smoke/testcases.yaml
@@ -149,7 +149,9 @@ tiers:
         description: >-
           It runs the remaining sig-network testing excluding the
           following labels: Conformance (part of k8s_conformance),
-          all features and load.balancer.
+          load.balancer, NetworkPolicy, Networking-IPv6,
+          IPv6DualStackAlphaFeature, SCTP and Example. A couple of features may
+          be automatically skipped like NEG and kubemci.
         dependencies:
           - DEPLOY_SCENARIO: "k8-*"
         run:
@@ -160,32 +162,7 @@ tiers:
               focus: \[sig-network\]
               skip: "\\[Disruptive\\]|\\[Flaky\\]|\\[alpha\\]|\
                 \\[Serial\\]|\\[Conformance\\]|load.balancer|\
-                LoadBalancer|\\[Feature:.+\\]"
-      - case_name: sig_network_features
-        project_name: functest
-        criteria: 100
-        blocking: false
-        description: >-
-          It verifies a couple of features by running a subset of e2e
-          tests: Ingress, Networking-IPv4, Networking-Performance,
-          PerformanceDNS and NoSNAT. It excludes by default
-          NetworkPolicy, Networking-IPv6, IPv6DualStackAlphaFeature,
-          SCTP and Example. A couple of features may be automatically
-          skipped like NEG and kubemci.
-        dependencies:
-          - DEPLOY_SCENARIO: "k8-*"
-        run:
-          name: e2e_testing
-          args:
-            nodes: 25
-            ginkgo:
-              focus: "\\[Feature:Ingress\\]|\
-                \\[Feature:Networking-IPv4\\]|\
-                \\[Feature:Networking-Performance\\]|\
-                \\[Feature:PerformanceDNS\\]|\\[Feature:NoSNAT\\]"
-              skip: "\\[Disruptive\\]|\\[Flaky\\]|\\[alpha\\]|\
-                \\[Serial\\]|\\[Conformance\\]|\
-                \\[Feature:NetworkPolicy\\]|\
+                LoadBalancer|\\[Feature:NetworkPolicy\\]|\
                 \\[Feature:Networking-IPv6\\]|\
                 \\[Feature:IPv6DualStackAlphaFeature\\]|\
                 \\[Feature:SCTP\\]|\\[Feature:Example\\]"
-- 
cgit 1.2.3-korg