Skip to content

Commit

Permalink
test: disable running with kube-proxy in 4.19 CI build
Browse files Browse the repository at this point in the history
... and instead rely on kube-proxy's strict replacement.

Also disable tests that are not working on 4.19 due to missing kernel
features on NodePort side.

Signed-off-by: Paul Chaignon <paul@cilium.io>
Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
  • Loading branch information
pchaigno authored and borkmann committed Jun 16, 2020
1 parent cb65fca commit 0fa8ac7
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 6 deletions.
7 changes: 4 additions & 3 deletions jenkinsfiles/ginkgo-kernel.Jenkinsfile
Expand Up @@ -19,8 +19,9 @@ pipeline {
returnStdout: true,
script: 'echo -n "${JobKernelVersion}"'
)}"""
// if we are running in net-next, we need to set NETNEXT=1, K8S_NODES=3, NO_CILIUM_ON_NODE="k8s3" and KUBEPROXY="0"
// otherwise we set NETNEXT=0, K8S_NODES=2, NO_CILIUM_ON_NODE="" and KUBEPROXY=""
// We set KUBEPROXY="0" if we are running net-next or 4.19; otherwise, KUBEPROXY=""
// If we are running in net-next, we need to set NETNEXT=1, K8S_NODES=3, and NO_CILIUM_ON_NODE="k8s3";
// otherwise we set NETNEXT=0, K8S_NODES=2, and NO_CILIUM_ON_NODE="".
NETNEXT="""${sh(
returnStdout: true,
script: 'if [ "${JobKernelVersion}" = "net-next" ]; then echo -n "1"; else echo -n "0"; fi'
Expand All @@ -35,7 +36,7 @@ pipeline {
)}"""
KUBEPROXY="""${sh(
returnStdout: true,
script: 'if [ "${JobKernelVersion}" = "net-next" ]; then echo -n "0"; else echo -n ""; fi'
script: 'if [ "${JobKernelVersion}" = "net-next" ] || [ "${JobKernelVersion}" = "419" ]; then echo -n "0"; else echo -n ""; fi'
)}"""
RUN_QUARANTINED="""${sh(
returnStdout: true,
Expand Down
4 changes: 1 addition & 3 deletions test/k8sT/Services.go
Expand Up @@ -741,8 +741,7 @@ var _ = Describe("K8sServicesTest", func() {
}(url)
}
// TODO: IPv6

if bpfNodePort {
if bpfNodePort && helpers.RunsOnNetNextKernel() {
httpURL := getHTTPLink("127.0.0.1", data.Spec.Ports[0].NodePort)
tftpURL := getTFTPLink("127.0.0.1", data.Spec.Ports[1].NodePort)
testCurlFromPodsFail(testDSClient, httpURL)
Expand All @@ -752,7 +751,6 @@ var _ = Describe("K8sServicesTest", func() {
tftpURL = getTFTPLink("::ffff:127.0.0.1", data.Spec.Ports[1].NodePort)
testCurlFromPodsFail(testDSClient, httpURL)
testCurlFromPodsFail(testDSClient, tftpURL)

}

wg.Wait()
Expand Down

0 comments on commit 0fa8ac7

Please sign in to comment.