Skip to content

Commit

Permalink
test: Temporary disable kubeproxy-free on 4.19
Browse files Browse the repository at this point in the history
Disable the kube-proxy replacement on the CI 4.19 job until
has been merged #11915, but
keep bpf_sock to avoid bpf_lxc complexity issues.

Also, get rid of non-working kernel vsn setting which complicates
passing of the KERNEL env var to ginkgo test runner.

Finally, disable ipsec + vxlan test on 4.19, as it is broken with the
contemporary 4.19 setup (TODO to investigate it).

Signed-off-by: Martynas Pumputis <m@lambda.lt>
  • Loading branch information
brb authored and aanm committed Jun 11, 2020
1 parent 0b5891a commit 6beb6b3
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 4 deletions.
4 changes: 2 additions & 2 deletions jenkinsfiles/ginkgo-kernel.Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ pipeline {
)}"""
TESTED_SUITE="k8s-${K8S_VERSION}"
GINKGO_TIMEOUT="300m"
DEFAULT_KERNEL="""${sh(
KERNEL="""${sh(
returnStdout: true,
script: 'echo -n "${JobKernelVersion}"'
)}"""
Expand Down Expand Up @@ -143,7 +143,7 @@ pipeline {
sh 'cp -a ${WORKSPACE}/${PROJ_PATH} ${GOPATH}/${PROJ_PATH}'
retry(3) {
dir("${TESTDIR}") {
sh 'KERNEL=$(python get-gh-comment-info.py "${ghprbCommentBody}" --retrieve=version | sed "s/^$/${DEFAULT_KERNEL}/") CILIUM_REGISTRY="$(./print-node-ip.sh)" timeout 15m ./vagrant-ci-start.sh'
sh 'CILIUM_REGISTRY="$(./print-node-ip.sh)" timeout 15m ./vagrant-ci-start.sh'
}
}
}
Expand Down
8 changes: 8 additions & 0 deletions test/helpers/kubectl.go
Original file line number Diff line number Diff line change
Expand Up @@ -2140,6 +2140,14 @@ func (kub *Kubectl) overwriteHelmOptions(options map[string]string) error {
}
}

// Temporary workaround until https://github.com/cilium/cilium/pull/11915
// has been merged. Otherwise, the BPF verifier rejects some programs on
// the 4.19 kernel
if os.Getenv("KERNEL") == "419" {
options = addIfNotOverwritten(options, "global.kubeProxyReplacement", "partial")
options = addIfNotOverwritten(options, "global.hostServices.enabled", "true")
}

if !RunsWithKubeProxy() {
nodeIP, err := kub.GetNodeIPByLabel(K8s1, false)
if err != nil {
Expand Down
6 changes: 4 additions & 2 deletions test/k8sT/DatapathConfiguration.go
Original file line number Diff line number Diff line change
Expand Up @@ -205,8 +205,10 @@ var _ = Describe("K8sDatapathConfig", func() {
}

It("Check connectivity with transparent encryption and VXLAN encapsulation", func() {
if !helpers.RunsOnNetNextOr419Kernel() {
Skip("Skipping test because it is not running with the net-next kernel or 4.19 kernel")
// FIXME(brb) Currently, the test is broken with CI 4.19 setup. Run it on 4.19
// once we have kube-proxy disabled there.
if !helpers.RunsOnNetNextKernel() {
Skip("Skipping test because it is not running with the net-next kernel")
return
}
SkipItIfNoKubeProxy()
Expand Down

0 comments on commit 6beb6b3

Please sign in to comment.