From 3807f8ebf45347b0b2fdaea9f6978e96f87e77b0 Mon Sep 17 00:00:00 2001
From: Tabitha <fifedolapo02@gmail.com>
Date: Mon, 8 Mar 2021 13:59:49 +0100
Subject: [PATCH] Adds SCTPConnectivity tests to e2e network policy tests

Depends-On: https://review.opendev.org/c/openstack/ovn-octavia-provider/+/754429
Change-Id: Ibd1ae1d2cb22f82ebf2aabd1e74b97213df93034
---
 .zuul.d/sdn.yaml                 |  6 ++++--
 playbooks/run_k8s_e2e_tests.yaml | 28 ++++++++++++++++++++--------
 2 files changed, 24 insertions(+), 10 deletions(-)

diff --git a/.zuul.d/sdn.yaml b/.zuul.d/sdn.yaml
index 693f5ed86..aa2d9fbeb 100644
--- a/.zuul.d/sdn.yaml
+++ b/.zuul.d/sdn.yaml
@@ -139,11 +139,12 @@
         Q_ML2_PLUGIN_TYPE_DRIVERS: local,flat,vlan,geneve
         Q_ML2_TENANT_NETWORK_TYPE: geneve
         Q_USE_PROVIDERNET_FOR_PUBLIC: true
-        VAR_RUN_PATH: /var/run
+        VAR_RUN_PATH: /usr/local/var/run
         PHYSICAL_NETWORK: public
         OVN_L3_CREATE_PUBLIC_NETWORK: true
+        OVN_BUILD_FROM_SOURCE: true
         ENABLE_CHASSIS_AS_GW: true
-        OVN_BRANCH: v20.06.1
+        OVN_BRANCH: v20.06.2
         KURYR_NEUTRON_DEFAULT_ROUTER: kuryr-router
         KURYR_EP_DRIVER_OCTAVIA_PROVIDER: ovn
         KURYR_K8S_OCTAVIA_MEMBER_MODE: L2
@@ -183,4 +184,5 @@
       np_sleep: 30
       zuul_copy_output:
         '/home/zuul/np_kubetest.log': 'logs'
+        '/home/zuul/np_sctp_kubetest.log': 'logs'
     voting: false
diff --git a/playbooks/run_k8s_e2e_tests.yaml b/playbooks/run_k8s_e2e_tests.yaml
index 795ca976b..ab7ab74ae 100644
--- a/playbooks/run_k8s_e2e_tests.yaml
+++ b/playbooks/run_k8s_e2e_tests.yaml
@@ -47,7 +47,8 @@
       shell: |
         sed -i 's/podStartTimeout = .*/podStartTimeout = 2 * time.Minute/' test/e2e/framework/pod/wait.go
         sed -i 's/for i in $(seq 1 5)/sleep {{ np_sleep }};for i in $(seq 1 300)/' test/e2e/network/network_policy.go
-        sed -i '/"add", "\/metadata\/labels\/isolated", nil)/a \\t\t\ttime.Sleep(60 * time.Second)' test/e2e/network/network_policy.go
+        sed -i '/"add", "\/metadata\/labels\/isolated", nil)/a\\t\t\ttime.Sleep(60 * time.Second)' test/e2e/network/network_policy.go
+        sed -i '/f, f.Namespace, "client-a", service, 80, v1.ProtocolSCTP)/a \\t\t\ttime.Sleep(60 * time.Second)' test/e2e/network/network_policy.go
       args:
         chdir: ~/kubernetes
 
@@ -86,10 +87,21 @@
       become: yes
 
     - name: Run Network Policy tests
-      shell: kubetest --provider=local --check-version-skew=false --test --ginkgo-parallel={{ np_parallel_number }} --test_args="--ginkgo.focus=\[Feature:NetworkPolicy --ginkgo.skip=\[Feature:SCTPConnectivity|should.enforce.policies.to.check.ingress.and.egress.policies.can.be.controlled.independently.based.on.PodSelector --host=http://127.0.0.1:8080" --dump=/tmp > ~/np_kubetest.log
-      args:
-        chdir: ~/kubernetes
-      environment:
-        GINKGO_NO_COLOR: "y"
-        KUBECONFIG: "{{ ansible_env.HOME }}/.kube/config"
-        PATH: "{{ ansible_env.PATH }}:/usr/local/go/bin:{{ ansible_env.HOME }}/go/bin"
+      block:
+      - name: Run Network Policy tests without SCTPConnectivity
+        shell: kubetest --provider=local --check-version-skew=false --test --ginkgo-parallel={{ np_parallel_number }} --test_args="--ginkgo.focus=\[Feature:NetworkPolicy --ginkgo.skip=\[Feature:SCTPConnectivity|should.enforce.policies.to.check.ingress.and.egress.policies.can.be.controlled.independently.based.on.PodSelector --host=http://127.0.0.1:8080" --dump=/tmp > ~/np_kubetest.log
+        args:
+          chdir: ~/kubernetes
+        environment:
+          GINKGO_NO_COLOR: "y"
+          KUBECONFIG: "{{ ansible_env.HOME }}/.kube/config"
+          PATH: "{{ ansible_env.PATH }}:/usr/local/go/bin:{{ ansible_env.HOME }}/go/bin"
+      always:
+      - name: Run Network Policy SCTPConnectivity tests
+        shell: kubetest --provider=local --check-version-skew=false --test --ginkgo-parallel={{ np_parallel_number }} --test_args="--ginkgo.focus=NetworkPolicy.\[Feature:SCTPConnectivity --host=http://127.0.0.1:8080" --dump=/tmp > ~/np_sctp_kubetest.log
+        args:
+          chdir: ~/kubernetes
+        environment:
+          GINKGO_NO_COLOR: "y"
+          KUBECONFIG: "{{ ansible_env.HOME }}/.kube/config"
+          PATH: "{{ ansible_env.PATH }}:/usr/local/go/bin:{{ ansible_env.HOME }}/go/bin"