From 3b75093e0a3d80d8da48fd71cb6844ad9a90b3d4 Mon Sep 17 00:00:00 2001 From: Jun Xiang Tee Date: Thu, 13 Jul 2017 12:14:55 -0700 Subject: [PATCH] move sig-apps upgrade tests to its directory --- test/e2e/BUILD | 1 + test/e2e/cluster_upgrade.go | 9 ++-- test/e2e/upgrades/BUILD | 15 ++----- test/e2e/upgrades/apps/BUILD | 48 +++++++++++++++++++++ test/e2e/upgrades/{ => apps}/daemonsets.go | 3 +- test/e2e/upgrades/{ => apps}/deployments.go | 7 +-- test/e2e/upgrades/{ => apps}/job.go | 3 +- test/e2e/upgrades/{ => apps}/statefulset.go | 5 ++- 8 files changed, 69 insertions(+), 22 deletions(-) create mode 100644 test/e2e/upgrades/apps/BUILD rename test/e2e/upgrades/{ => apps}/daemonsets.go (98%) rename test/e2e/upgrades/{ => apps}/deployments.go (97%) rename test/e2e/upgrades/{ => apps}/job.go (96%) rename test/e2e/upgrades/{ => apps}/statefulset.go (95%) diff --git a/test/e2e/BUILD b/test/e2e/BUILD index 0c539cd6255..cf85fb6cdff 100644 --- a/test/e2e/BUILD +++ b/test/e2e/BUILD @@ -132,6 +132,7 @@ go_library( "//test/e2e/manifest:go_default_library", "//test/e2e/metrics:go_default_library", "//test/e2e/upgrades:go_default_library", + "//test/e2e/upgrades/apps:go_default_library", "//test/e2e/workload:go_default_library", "//test/e2e_federation:go_default_library", "//test/images/net/nat:go_default_library", diff --git a/test/e2e/cluster_upgrade.go b/test/e2e/cluster_upgrade.go index 8b6ea79721e..86949d0cfa7 100644 --- a/test/e2e/cluster_upgrade.go +++ b/test/e2e/cluster_upgrade.go @@ -30,6 +30,7 @@ import ( "k8s.io/kubernetes/test/e2e/framework" "k8s.io/kubernetes/test/e2e/framework/ginkgowrapper" "k8s.io/kubernetes/test/e2e/upgrades" + apps "k8s.io/kubernetes/test/e2e/upgrades/apps" "k8s.io/kubernetes/test/utils/junit" . "github.com/onsi/ginkgo" @@ -38,13 +39,13 @@ import ( var upgradeTests = []upgrades.Test{ &upgrades.ServiceUpgradeTest{}, &upgrades.SecretUpgradeTest{}, - &upgrades.StatefulSetUpgradeTest{}, - &upgrades.DeploymentUpgradeTest{}, - &upgrades.JobUpgradeTest{}, + &apps.StatefulSetUpgradeTest{}, + &apps.DeploymentUpgradeTest{}, + &apps.JobUpgradeTest{}, &upgrades.ConfigMapUpgradeTest{}, &upgrades.HPAUpgradeTest{}, &upgrades.PersistentVolumeUpgradeTest{}, - &upgrades.DaemonSetUpgradeTest{}, + &apps.DaemonSetUpgradeTest{}, &upgrades.IngressUpgradeTest{}, &upgrades.AppArmorUpgradeTest{}, } diff --git a/test/e2e/upgrades/BUILD b/test/e2e/upgrades/BUILD index 654af2ab4d9..02d146dcdfc 100644 --- a/test/e2e/upgrades/BUILD +++ b/test/e2e/upgrades/BUILD @@ -12,25 +12,19 @@ go_library( srcs = [ "apparmor.go", "configmaps.go", - "daemonsets.go", - "deployments.go", "etcd.go", "horizontal_pod_autoscalers.go", "ingress.go", - "job.go", "mysql.go", "persistent_volumes.go", "secrets.go", "services.go", - "statefulset.go", "sysctl.go", "upgrade.go", ], tags = ["automanaged"], deps = [ "//pkg/api/v1/helper:go_default_library", - "//pkg/controller:go_default_library", - "//pkg/controller/deployment/util:go_default_library", "//pkg/kubelet/sysctl:go_default_library", "//pkg/util/version:go_default_library", "//test/e2e/common:go_default_library", @@ -38,14 +32,10 @@ go_library( "//vendor/github.com/onsi/ginkgo:go_default_library", "//vendor/github.com/onsi/gomega:go_default_library", "//vendor/github.com/onsi/gomega/gstruct:go_default_library", - "//vendor/k8s.io/api/apps/v1beta1:go_default_library", "//vendor/k8s.io/api/autoscaling/v1:go_default_library", - "//vendor/k8s.io/api/batch/v1:go_default_library", "//vendor/k8s.io/api/core/v1:go_default_library", - "//vendor/k8s.io/api/extensions/v1beta1:go_default_library", "//vendor/k8s.io/apimachinery/pkg/api/errors:go_default_library", "//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library", - "//vendor/k8s.io/apimachinery/pkg/labels:go_default_library", "//vendor/k8s.io/apimachinery/pkg/util/errors:go_default_library", "//vendor/k8s.io/apimachinery/pkg/util/uuid:go_default_library", "//vendor/k8s.io/apimachinery/pkg/util/wait:go_default_library", @@ -61,6 +51,9 @@ filegroup( filegroup( name = "all-srcs", - srcs = [":package-srcs"], + srcs = [ + ":package-srcs", + "//test/e2e/upgrades/apps:all-srcs", + ], tags = ["automanaged"], ) diff --git a/test/e2e/upgrades/apps/BUILD b/test/e2e/upgrades/apps/BUILD new file mode 100644 index 00000000000..573308257cf --- /dev/null +++ b/test/e2e/upgrades/apps/BUILD @@ -0,0 +1,48 @@ +package(default_visibility = ["//visibility:public"]) + +licenses(["notice"]) + +load( + "@io_bazel_rules_go//go:def.bzl", + "go_library", +) + +go_library( + name = "go_default_library", + srcs = [ + "daemonsets.go", + "deployments.go", + "job.go", + "statefulset.go", + ], + tags = ["automanaged"], + deps = [ + "//pkg/controller:go_default_library", + "//pkg/controller/deployment/util:go_default_library", + "//pkg/util/version:go_default_library", + "//test/e2e/framework:go_default_library", + "//test/e2e/upgrades:go_default_library", + "//vendor/github.com/onsi/ginkgo:go_default_library", + "//vendor/github.com/onsi/gomega:go_default_library", + "//vendor/k8s.io/api/apps/v1beta1:go_default_library", + "//vendor/k8s.io/api/batch/v1:go_default_library", + "//vendor/k8s.io/api/core/v1:go_default_library", + "//vendor/k8s.io/api/extensions/v1beta1:go_default_library", + "//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library", + "//vendor/k8s.io/apimachinery/pkg/labels:go_default_library", + "//vendor/k8s.io/apimachinery/pkg/util/wait:go_default_library", + ], +) + +filegroup( + name = "package-srcs", + srcs = glob(["**"]), + tags = ["automanaged"], + visibility = ["//visibility:private"], +) + +filegroup( + name = "all-srcs", + srcs = [":package-srcs"], + tags = ["automanaged"], +) diff --git a/test/e2e/upgrades/daemonsets.go b/test/e2e/upgrades/apps/daemonsets.go similarity index 98% rename from test/e2e/upgrades/daemonsets.go rename to test/e2e/upgrades/apps/daemonsets.go index 49e15f9c502..9fbd88a230e 100644 --- a/test/e2e/upgrades/daemonsets.go +++ b/test/e2e/upgrades/apps/daemonsets.go @@ -26,6 +26,7 @@ import ( extensions "k8s.io/api/extensions/v1beta1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/kubernetes/test/e2e/framework" + "k8s.io/kubernetes/test/e2e/upgrades" . "github.com/onsi/ginkgo" ) @@ -87,7 +88,7 @@ func (t *DaemonSetUpgradeTest) Setup(f *framework.Framework) { // Test waits until the upgrade has completed and then verifies that the DaemonSet // is still running -func (t *DaemonSetUpgradeTest) Test(f *framework.Framework, done <-chan struct{}, upgrade UpgradeType) { +func (t *DaemonSetUpgradeTest) Test(f *framework.Framework, done <-chan struct{}, upgrade upgrades.UpgradeType) { By("Waiting for upgradet to complete before re-validating DaemonSet") <-done diff --git a/test/e2e/upgrades/deployments.go b/test/e2e/upgrades/apps/deployments.go similarity index 97% rename from test/e2e/upgrades/deployments.go rename to test/e2e/upgrades/apps/deployments.go index c063a3f14b0..b4089272d9c 100644 --- a/test/e2e/upgrades/deployments.go +++ b/test/e2e/upgrades/apps/deployments.go @@ -24,6 +24,7 @@ import ( deploymentutil "k8s.io/kubernetes/pkg/controller/deployment/util" "k8s.io/kubernetes/pkg/util/version" "k8s.io/kubernetes/test/e2e/framework" + "k8s.io/kubernetes/test/e2e/upgrades" . "github.com/onsi/ginkgo" ) @@ -42,7 +43,7 @@ type DeploymentUpgradeTest struct { func (DeploymentUpgradeTest) Name() string { return "[sig-apps] deployment-upgrade" } -func (DeploymentUpgradeTest) Skip(upgCtx UpgradeContext) bool { +func (DeploymentUpgradeTest) Skip(upgCtx upgrades.UpgradeContext) bool { // The Deployment upgrade test currently relies on implementation details to probe the // ReplicaSets belonging to a Deployment. As of 1.7, the client code we call into no // longer supports talking to a server <1.6. (see #47685) @@ -56,7 +57,7 @@ func (DeploymentUpgradeTest) Skip(upgCtx UpgradeContext) bool { return false } -var _ Skippable = DeploymentUpgradeTest{} +var _ upgrades.Skippable = DeploymentUpgradeTest{} // Setup creates a deployment and makes sure it has a new and an old replica set running. // This calls in to client code and should not be expected to work against a cluster more than one minor version away from the current version. @@ -125,7 +126,7 @@ func (t *DeploymentUpgradeTest) Setup(f *framework.Framework) { } // Test checks whether the replica sets for a deployment are the same after an upgrade. -func (t *DeploymentUpgradeTest) Test(f *framework.Framework, done <-chan struct{}, upgrade UpgradeType) { +func (t *DeploymentUpgradeTest) Test(f *framework.Framework, done <-chan struct{}, upgrade upgrades.UpgradeType) { // Block until upgrade is done By(fmt.Sprintf("Waiting for upgrade to finish before checking replica sets for deployment %q", t.oldD.Name)) <-done diff --git a/test/e2e/upgrades/job.go b/test/e2e/upgrades/apps/job.go similarity index 96% rename from test/e2e/upgrades/job.go rename to test/e2e/upgrades/apps/job.go index 4a66cb225b9..1fd2b1a28b7 100644 --- a/test/e2e/upgrades/job.go +++ b/test/e2e/upgrades/apps/job.go @@ -20,6 +20,7 @@ import ( batch "k8s.io/api/batch/v1" "k8s.io/api/core/v1" "k8s.io/kubernetes/test/e2e/framework" + "k8s.io/kubernetes/test/e2e/upgrades" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" @@ -49,7 +50,7 @@ func (t *JobUpgradeTest) Setup(f *framework.Framework) { } // Test verifies that the Jobs Pods are running after the an upgrade -func (t *JobUpgradeTest) Test(f *framework.Framework, done <-chan struct{}, upgrade UpgradeType) { +func (t *JobUpgradeTest) Test(f *framework.Framework, done <-chan struct{}, upgrade upgrades.UpgradeType) { <-done By("Ensuring active pods == parallelism") running, err := framework.CheckForAllJobPodsRunning(f.ClientSet, t.namespace, t.job.Name, 2) diff --git a/test/e2e/upgrades/statefulset.go b/test/e2e/upgrades/apps/statefulset.go similarity index 95% rename from test/e2e/upgrades/statefulset.go rename to test/e2e/upgrades/apps/statefulset.go index f30c681b3b3..4fa3133f108 100644 --- a/test/e2e/upgrades/statefulset.go +++ b/test/e2e/upgrades/apps/statefulset.go @@ -25,6 +25,7 @@ import ( "k8s.io/kubernetes/pkg/util/version" "k8s.io/kubernetes/test/e2e/framework" + "k8s.io/kubernetes/test/e2e/upgrades" ) // StatefulSetUpgradeTest implements an upgrade test harness for StatefulSet upgrade testing. @@ -36,7 +37,7 @@ type StatefulSetUpgradeTest struct { func (StatefulSetUpgradeTest) Name() string { return "[sig-apps] statefulset-upgrade" } -func (StatefulSetUpgradeTest) Skip(upgCtx UpgradeContext) bool { +func (StatefulSetUpgradeTest) Skip(upgCtx upgrades.UpgradeContext) bool { minVersion := version.MustParseSemantic("1.5.0") for _, vCtx := range upgCtx.Versions { @@ -81,7 +82,7 @@ func (t *StatefulSetUpgradeTest) Setup(f *framework.Framework) { } // Waits for the upgrade to complete and verifies the StatefulSet basic functionality -func (t *StatefulSetUpgradeTest) Test(f *framework.Framework, done <-chan struct{}, upgrade UpgradeType) { +func (t *StatefulSetUpgradeTest) Test(f *framework.Framework, done <-chan struct{}, upgrade upgrades.UpgradeType) { <-done t.verify() }