Skip to content

Commit

Permalink
test: Run only K8sVerifier and K8sDatapathConfig on 5.4
Browse files Browse the repository at this point in the history
Since the goal of the 5.4 CI job is only to catch complexity issues,
other test suites are skipped. They are not expected to help us catch
new complexity issues compared to K8sVerifier and K8sDatapathConfig.

Signed-off-by: Paul Chaignon <paul@cilium.io>
  • Loading branch information
pchaigno authored and rolinh committed Apr 29, 2021
1 parent 869a008 commit dfb8220
Show file tree
Hide file tree
Showing 7 changed files with 19 additions and 7 deletions.
4 changes: 3 additions & 1 deletion test/k8sT/Chaos.go
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,9 @@ import (
. "github.com/onsi/gomega"
)

var _ = Describe("K8sChaosTest", func() {
// The 5.4 CI job is intended to catch BPF complexity regressions and as such
// doesn't need to execute this test suite.
var _ = SkipDescribeIf(helpers.RunsOn54Kernel, "K8sChaosTest", func() {

var (
kubectl *helpers.Kubectl
Expand Down
4 changes: 3 additions & 1 deletion test/k8sT/KafkaPolicies.go
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,9 @@ import (
. "github.com/onsi/gomega"
)

var _ = Describe("K8sKafkaPolicyTest", func() {
// The 5.4 CI job is intended to catch BPF complexity regressions and as such
// doesn't need to execute this test suite.
var _ = SkipDescribeIf(helpers.RunsOn54Kernel, "K8sKafkaPolicyTest", func() {

var (
kubectl *helpers.Kubectl
Expand Down
2 changes: 1 addition & 1 deletion test/k8sT/Policies.go
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ var _ = SkipDescribeIf(func() bool {
// We only need to run on 4.9 with kube-proxy and net-next with KPR
// and the third node. Other CI jobs are not expected to increase
// code coverage.
return helpers.RunsOnGKE() || helpers.RunsOn419Kernel()
return helpers.RunsOnGKE() || helpers.RunsOn419Kernel() || helpers.RunsOn54Kernel()
}, "K8sPolicyTest", func() {

var (
Expand Down
4 changes: 3 additions & 1 deletion test/k8sT/Services.go
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,9 @@ import (
v1 "k8s.io/api/core/v1"
)

var _ = Describe("K8sServicesTest", func() {
// The 5.4 CI job is intended to catch BPF complexity regressions and as such
// doesn't need to execute this test suite.
var _ = SkipDescribeIf(helpers.RunsOn54Kernel, "K8sServicesTest", func() {
var (
kubectl *helpers.Kubectl
ciliumFilename string
Expand Down
4 changes: 3 additions & 1 deletion test/k8sT/fqdn.go
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,9 @@ import (
. "github.com/onsi/gomega"
)

var _ = Describe("K8sFQDNTest", func() {
// The 5.4 CI job is intended to catch BPF complexity regressions and as such
// doesn't need to execute this test suite.
var _ = SkipDescribeIf(helpers.RunsOn54Kernel, "K8sFQDNTest", func() {
var (
kubectl *helpers.Kubectl
backgroundCancel context.CancelFunc = func() {}
Expand Down
4 changes: 3 additions & 1 deletion test/k8sT/istio.go
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,9 @@ import (
// This tests the Istio integration, following the configuration
// instructions specified in the Istio Getting Started Guide in
// Documentation/gettingstarted/istio.rst.
var _ = Describe("K8sIstioTest", func() {
// The 5.4 CI job is intended to catch BPF complexity regressions and as such
// doesn't need to execute this test suite.
var _ = SkipDescribeIf(helpers.RunsOn54Kernel, "K8sIstioTest", func() {

var (
// istioSystemNamespace is the default namespace into which Istio is
Expand Down
4 changes: 3 additions & 1 deletion test/k8sT/l7_demos.go
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,9 @@ import (
. "github.com/onsi/gomega"
)

var _ = Describe("K8sDemosTest", func() {
// The 5.4 CI job is intended to catch BPF complexity regressions and as such
// doesn't need to execute this test suite.
var _ = SkipDescribeIf(helpers.RunsOn54Kernel, "K8sDemosTest", func() {

var (
kubectl *helpers.Kubectl
Expand Down

0 comments on commit dfb8220

Please sign in to comment.