openstack/kuryr-kubernetes
Code Issues Proposed changes

Merge "Adds SCTPConnectivity tests to e2e network policy tests"

Browse Source
This commit is contained in:
Zuul 2021-03-16 19:32:40 +00:00 committed by Gerrit Code Review
commit 93a522e60f
2 changed files with 24 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.zuul.d/sdn.yaml
View File

@ -138,11 +138,12 @@
Q_ML2_PLUGIN_TYPE_DRIVERS: local,flat,vlan,geneve Q_ML2_PLUGIN_TYPE_DRIVERS: local,flat,vlan,geneve
Q_ML2_TENANT_NETWORK_TYPE: geneve Q_ML2_TENANT_NETWORK_TYPE: geneve
Q_USE_PROVIDERNET_FOR_PUBLIC: true Q_USE_PROVIDERNET_FOR_PUBLIC: true
VAR_RUN_PATH: /var/run VAR_RUN_PATH: /usr/local/var/run
PHYSICAL_NETWORK: public PHYSICAL_NETWORK: public
OVN_L3_CREATE_PUBLIC_NETWORK: true OVN_L3_CREATE_PUBLIC_NETWORK: true
OVN_BUILD_FROM_SOURCE: true
ENABLE_CHASSIS_AS_GW: true ENABLE_CHASSIS_AS_GW: true
OVN_BRANCH: v20.06.1 OVN_BRANCH: v20.06.2
KURYR_NEUTRON_DEFAULT_ROUTER: kuryr-router KURYR_NEUTRON_DEFAULT_ROUTER: kuryr-router
KURYR_EP_DRIVER_OCTAVIA_PROVIDER: ovn KURYR_EP_DRIVER_OCTAVIA_PROVIDER: ovn
KURYR_K8S_OCTAVIA_MEMBER_MODE: L2 KURYR_K8S_OCTAVIA_MEMBER_MODE: L2
@ -182,4 +183,5 @@
np_sleep: 30 np_sleep: 30
zuul_copy_output: zuul_copy_output:
'/home/zuul/np_kubetest.log': 'logs' '/home/zuul/np_kubetest.log': 'logs'
'/home/zuul/np_sctp_kubetest.log': 'logs'
voting: false voting: false

28
playbooks/run_k8s_e2e_tests.yaml
View File

@ -47,7 +47,8 @@
shell: | shell: |
sed -i 's/podStartTimeout = .*/podStartTimeout = 2 * time.Minute/' test/e2e/framework/pod/wait.go 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 '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: args:
chdir: ~/kubernetes chdir: ~/kubernetes
@ -86,10 +87,21 @@
become: yes become: yes
- name: Run Network Policy tests - 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 block:
args: - name: Run Network Policy tests without SCTPConnectivity
chdir: ~/kubernetes 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
environment: args:
GINKGO_NO_COLOR: "y" chdir: ~/kubernetes
KUBECONFIG: "{{ ansible_env.HOME }}/.kube/config" environment:
PATH: "{{ ansible_env.PATH }}:/usr/local/go/bin:{{ ansible_env.HOME }}/go/bin" 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"