E2E test fixes (#82)

Author: Nikolas De Giorgis

cmd/testrunner/main.go

@@ -30,34 +30,34 @@ import (
 )
 
 type flags struct {
-	deployDir     string
-	namespace     string
-	operatorImage string
-	preHookImage  string
-	testImage     string
-	test          string
-	skipCleanup   string
+	deployDir      string
+	namespace      string
+	operatorImage  string
+	preHookImage   string
+	testImage      string
+	test           string
+	performCleanup string
 }
 
 func parseFlags() flags {
-	var namespace, deployDir, operatorImage, preHookImage, testImage, test, skipCleanup *string
+	var namespace, deployDir, operatorImage, preHookImage, testImage, test, performCleanup *string
 	namespace = flag.String("namespace", "default", "the namespace the operator and tests should be deployed in")
 	deployDir = flag.String("deployDir", "deploy/", "the path to the directory which contains the yaml deployment files")
 	operatorImage = flag.String("operatorImage", "quay.io/mongodb/community-operator-dev:latest", "the image which should be used for the operator deployment")
 	preHookImage = flag.String("preHookImage", "quay.io/mongodb/community-operator-prehook:latest", "the prestophook image")
 	testImage = flag.String("testImage", "quay.io/mongodb/community-operator-e2e:latest", "the image which should be used for the operator e2e tests")
 	test = flag.String("test", "", "test e2e test that should be run. (name of folder containing the test)")
-	skipCleanup = flag.String("skipCleanup", "1", "specifies whether to skip cleaning up the context or not")
+	performCleanup = flag.String("performCleanup", "1", "specifies whether to performing a cleanup the context or not")
 	flag.Parse()
 
 	return flags{
-		deployDir:     *deployDir,
-		namespace:     *namespace,
-		operatorImage: *operatorImage,
-		preHookImage:  *preHookImage,
-		testImage:     *testImage,
-		test:          *test,
-		skipCleanup:   *skipCleanup,
+		deployDir:      *deployDir,
+		namespace:      *namespace,
+		operatorImage:  *operatorImage,
+		preHookImage:   *preHookImage,
+		testImage:      *testImage,
+		test:           *test,
+		performCleanup: *performCleanup,
 	}
 }
 
@@ -97,7 +97,7 @@ func runCmd(f flags) error {
 	fmt.Println("Successfully deployed the operator")
 
 	testToRun := "test/operator-sdk-test.yaml"
-	if err := buildKubernetesResourceFromYamlFile(c, testToRun, &corev1.Pod{}, withNamespace(f.namespace), withTestImage(f.testImage), withTest(f.test), withEnvVar("SKIP_CLEANUP", f.skipCleanup)); err != nil {
+	if err := buildKubernetesResourceFromYamlFile(c, testToRun, &corev1.Pod{}, withNamespace(f.namespace), withTestImage(f.testImage), withTest(f.test), withEnvVar("PERFORM_CLEANUP", f.performCleanup)); err != nil {
 		return fmt.Errorf("error deploying test: %v", err)
 	}
 

scripts/dev/e2e.py

@@ -139,7 +139,7 @@ def create_test_runner_pod(
     test: str,
     config_file: str,
     tag: str,
-    skip_cleanup: str,
+    perform_cleanup: str,
     test_runner_image_name: str,
 ):
     """
@@ -148,7 +148,7 @@ def create_test_runner_pod(
     dev_config = load_config(config_file)
     corev1 = client.CoreV1Api()
     pod_body = _get_testrunner_pod_body(
-        test, config_file, tag, skip_cleanup, test_runner_image_name
+        test, config_file, tag, perform_cleanup, test_runner_image_name
     )
 
     if not k8s_conditions.wait(
@@ -183,7 +183,7 @@ def _get_testrunner_pod_body(
     test: str,
     config_file: str,
     tag: str,
-    skip_cleanup: str,
+    perform_cleanup: str,
     test_runner_image_name: str,
 ) -> Dict:
     dev_config = load_config(config_file)
@@ -216,7 +216,7 @@ def _get_testrunner_pod_body(
                         ),
                         "--test={}".format(test),
                         "--namespace={}".format(dev_config.namespace),
-                        "--skipCleanup={}".format(skip_cleanup),
+                        "--performCleanup={}".format(perform_cleanup),
                     ],
                 }
             ],
@@ -228,12 +228,12 @@ def parse_args():
     parser = argparse.ArgumentParser()
     parser.add_argument("--test", help="Name of the test to run")
     parser.add_argument(
-        "--skip-operator-install",
-        help="Do not install the Operator, assumes one is installed already",
-        action="store_false",
+        "--install-operator",
+        help="Install the operator instead of assuming one already exists",
+        action="store_true",
     )
     parser.add_argument(
-        "--skip-image-build", help="Skip building images", action="store_false",
+        "--build-images", help="Build testrunner, e2e and prestop-hook images", action="store_true",
     )
     parser.add_argument(
         "--tag",
@@ -242,46 +242,46 @@ def parse_args():
         default="latest",
     )
     parser.add_argument(
-        "--dump_diagnostic",
-        help="Dump diagnostic information into files",
-        action="store_false",
+        "--skip-dump-diagnostic",
+        help="Skip the dump of diagnostic information into files",
+        action="store_true",
     )
     parser.add_argument(
-        "--skip-cleanup",
-        help="skip the context cleanup when the test ends",
-        action="store_false",
+        "--perform-cleanup",
+        help="Cleanup the context after executing the tests",
+        action="store_true",
     )
     parser.add_argument("--config_file", help="Path to the config file")
     return parser.parse_args()
 
 
 def build_and_push_images(args, dev_config):
     test_runner_name = dev_config.testrunner_image
-    if not args.skip_operator_install:
+    if args.install_operator:
         build_and_push_operator(
             dev_config.repo_url,
             "{}/{}:{}".format(dev_config.repo_url, dev_config.operator_image, args.tag),
             ".",
         )
         deploy_operator()
-        if not args.skip_image_build:
-            build_and_push_testrunner(
-                dev_config.repo_url,
-                "{}/{}:{}".format(dev_config.repo_url, test_runner_name, args.tag),
-                ".",
-            )
-            build_and_push_e2e(
-                dev_config.repo_url,
-                "{}/{}:{}".format(dev_config.repo_url, dev_config.e2e_image, args.tag),
-                ".",
-            )
-            build_and_push_prehook(
-                dev_config.repo_url,
-                "{}/{}:{}".format(
-                    dev_config.repo_url, dev_config.prestop_hook_image, args.tag
-                ),
-                ".",
-            )
+    if args.build_images:
+        build_and_push_testrunner(
+            dev_config.repo_url,
+            "{}/{}:{}".format(dev_config.repo_url, test_runner_name, args.tag),
+            ".",
+        )
+        build_and_push_e2e(
+            dev_config.repo_url,
+            "{}/{}:{}".format(dev_config.repo_url, dev_config.e2e_image, args.tag),
+            ".",
+        )
+        build_and_push_prehook(
+            dev_config.repo_url,
+            "{}/{}:{}".format(
+                dev_config.repo_url, dev_config.prestop_hook_image, args.tag
+            ),
+            ".",
+        )
 
 
 def prepare_and_run_testrunner(args, dev_config):
@@ -292,7 +292,7 @@ def prepare_and_run_testrunner(args, dev_config):
         args.test,
         args.config_file,
         args.tag,
-        args.skip_cleanup,
+        args.perform_cleanup,
         test_runner_name,
     )
     corev1 = client.CoreV1Api()
@@ -318,11 +318,11 @@ def main():
     try:
         build_and_push_images(args, dev_config)
         prepare_and_run_testrunner(args, dev_config)
-        test_runner_pod=k8s_request_data.get_pod_namespaced(dev_config.namespace,TEST_RUNNER_NAME)
     finally:
-        if args.dump_diagnostic:
+        if not args.skip_dump_diagnostic:
             dump_diagnostic.dump_all(dev_config.namespace)
 
+    test_runner_pod=k8s_request_data.get_pod_namespaced(dev_config.namespace,TEST_RUNNER_NAME)
     if test_runner_pod.status.phase != "Succeeded":
         sys.exit(1)
 

test/e2e/e2eutil.go

@@ -6,9 +6,8 @@ import (
 	"testing"
 	"time"
 
-	"github.com/mongodb/mongodb-kubernetes-operator/pkg/kube/statefulset"
-
 	mdbv1 "github.com/mongodb/mongodb-kubernetes-operator/pkg/apis/mongodb/v1"
+	"github.com/mongodb/mongodb-kubernetes-operator/pkg/kube/statefulset"
 	f "github.com/operator-framework/operator-sdk/pkg/test"
 	appsv1 "k8s.io/api/apps/v1"
 	corev1 "k8s.io/api/core/v1"

test/e2e/replica_set_readiness_probe/replica_set_readiness_probe_test.go

@@ -18,6 +18,8 @@ func TestMain(m *testing.M) {
 
 func TestReplicaSetReadinessProbeScaling(t *testing.T) {
 
+	rand.Seed(time.Now().Unix())
+
 	ctx, shouldCleanup := setup.InitTest(t)
 
 	if shouldCleanup {
@@ -31,7 +33,7 @@ func TestReplicaSetReadinessProbeScaling(t *testing.T) {
 	t.Run("Stateful Set Reaches Ready State", mongodbtests.StatefulSetIsReady(&mdb))
 	t.Run("MongoDB is reachable", mongodbtests.IsReachableDuring(&mdb, time.Second*10,
 		func() {
-			t.Run("Delete Random Pod", mongodbtests.DeletePod(&mdb, rand.Intn(mdb.Spec.Members-1)))
+			t.Run("Delete Random Pod", mongodbtests.DeletePod(&mdb, rand.Intn(mdb.Spec.Members)))
 			t.Run("Test Replica Set Recovers", mongodbtests.StatefulSetIsReady(&mdb))
 			t.Run("MongoDB Reaches Running Phase", mongodbtests.MongoDBReachesRunningPhase(&mdb))
 			t.Run("Test Status Was Updated", mongodbtests.Status(&mdb,

test/e2e/setup/setup.go

@@ -12,7 +12,7 @@ import (
 )
 
 const (
-	skipCleanup = "SKIP_CLEANUP"
+	performCleanup = "PERFORM_CLEANUP"
 )
 
 func InitTest(t *testing.T) (*f.Context, bool) {
@@ -22,9 +22,9 @@ func InitTest(t *testing.T) (*f.Context, bool) {
 		t.Fatal(err)
 	}
 
-	skip := os.Getenv(skipCleanup)
+	clean := os.Getenv(performCleanup)
 
-	return ctx, skip != "True"
+	return ctx, clean == "True"
 }
 
 func registerTypesWithFramework(newTypes ...runtime.Object) error {