✨ [patch] Support skip running test on demand (#39)

api/v1beta1/activepromotion_types.go

@@ -118,6 +118,10 @@ type ActivePromotionSpec struct {
 	// TearDownDuration represents duration before tear down the previous active namespace
 	// +optional
 	TearDownDuration *metav1.Duration `json:"tearDownDuration,omitempty"`
+
+	// SkipTestRunner represents a flag for skipping running pre-active test
+	// +optional
+	SkipTestRunner bool `json:"skipTestRunner,omitempty"`
 }
 
 func (s *ActivePromotionSpec) SetTearDownDuration(d metav1.Duration) {

api/v1beta1/queue_types.go

@@ -109,6 +109,10 @@ type QueueSpec struct {
 
 	// TeamName represents team owner of the queue
 	TeamName string `json:"teamName"`
+
+	// SkipTestRunner represents a flag for skipping running test
+	// +optional
+	SkipTestRunner bool `json:"skipTestRunner,omitempty"`
 }
 
 type Image struct {

config/crds/env.samsahai.io_activepromotionhistories.yaml

@@ -56,6 +56,10 @@ spec:
                 spec:
                   description: ActivePromotionSpec defines the desired state of ActivePromotion
                   properties:
+                    skipTestRunner:
+                      description: SkipTestRunner represents a flag for skipping running
+                        pre-active test
+                      type: boolean
                     tearDownDuration:
                       description: TearDownDuration represents duration before tear
                         down the previous active namespace

config/crds/env.samsahai.io_activepromotions.yaml

@@ -34,6 +34,10 @@ spec:
         spec:
           description: ActivePromotionSpec defines the desired state of ActivePromotion
           properties:
+            skipTestRunner:
+              description: SkipTestRunner represents a flag for skipping running pre-active
+                test
+              type: boolean
             tearDownDuration:
               description: TearDownDuration represents duration before tear down the
                 previous active namespace

config/crds/env.samsahai.io_queuehistories.yaml

@@ -105,6 +105,10 @@ spec:
                       description: NoOfRetry defines how many times this component
                         has been tested
                       type: integer
+                    skipTestRunner:
+                      description: SkipTestRunner represents a flag for skipping running
+                        test
+                      type: boolean
                     teamName:
                       description: TeamName represents team owner of the queue
                       type: string

config/crds/env.samsahai.io_queues.yaml

@@ -72,6 +72,9 @@ spec:
               description: NoOfRetry defines how many times this component has been
                 tested
               type: integer
+            skipTestRunner:
+              description: SkipTestRunner represents a flag for skipping running test
+              type: boolean
             teamName:
               description: TeamName represents team owner of the queue
               type: string

docs/docs.go

@@ -1,6 +1,6 @@
 // GENERATED BY THE COMMAND ABOVE; DO NOT EDIT
 // This file was generated by swaggo/swag at
-// 2020-06-05 09:08:53.407712 +0700 +07 m=+0.253929246
+// 2020-06-12 13:43:13.431642 +0700 +07 m=+0.161754686
 
 package docs
 
@@ -722,6 +722,10 @@ var doc = `{
         "v1beta1.ActivePromotionSpec": {
             "type": "object",
             "properties": {
+                "skipTestRunner": {
+                    "description": "SkipTestRunner represents a flag for skipping running pre-active test\n+optional",
+                    "type": "boolean"
+                },
                 "tearDownDuration": {
                     "description": "TearDownDuration represents duration before tear down the previous active namespace\n+optional",
                     "type": "string"
@@ -1329,6 +1333,10 @@ var doc = `{
                     "description": "NoOfRetry defines how many times this component has been tested\n+optional",
                     "type": "integer"
                 },
+                "skipTestRunner": {
+                    "description": "SkipTestRunner represents a flag for skipping running test\n+optional",
+                    "type": "boolean"
+                },
                 "teamName": {
                     "description": "TeamName represents team owner of the queue",
                     "type": "string"

docs/swagger.json

@@ -701,6 +701,10 @@
         "v1beta1.ActivePromotionSpec": {
             "type": "object",
             "properties": {
+                "skipTestRunner": {
+                    "description": "SkipTestRunner represents a flag for skipping running pre-active test\n+optional",
+                    "type": "boolean"
+                },
                 "tearDownDuration": {
                     "description": "TearDownDuration represents duration before tear down the previous active namespace\n+optional",
                     "type": "string"
@@ -1308,6 +1312,10 @@
                     "description": "NoOfRetry defines how many times this component has been tested\n+optional",
                     "type": "integer"
                 },
+                "skipTestRunner": {
+                    "description": "SkipTestRunner represents a flag for skipping running test\n+optional",
+                    "type": "boolean"
+                },
                 "teamName": {
                     "description": "TeamName represents team owner of the queue",
                     "type": "string"

docs/swagger.yaml

@@ -50,6 +50,11 @@ definitions:
     type: object
   v1beta1.ActivePromotionSpec:
     properties:
+      skipTestRunner:
+        description: |-
+          SkipTestRunner represents a flag for skipping running pre-active test
+          +optional
+        type: boolean
       tearDownDuration:
         description: |-
           TearDownDuration represents duration before tear down the previous active namespace
@@ -567,6 +572,11 @@ definitions:
           NoOfRetry defines how many times this component has been tested
           +optional
         type: integer
+      skipTestRunner:
+        description: |-
+          SkipTestRunner represents a flag for skipping running test
+          +optional
+        type: boolean
       teamName:
         description: TeamName represents team owner of the queue
         type: string

internal/queue/controller.go

@@ -396,15 +396,16 @@ func (c *controller) resetQueueOrderWithCurrentQueue(ql *s2hv1beta1.QueueList, c
 }
 
 // EnsurePreActiveComponents ensures that components with were deployed with `pre-active` config and tested
-func EnsurePreActiveComponents(c client.Client, teamName, namespace string) (q *s2hv1beta1.Queue, err error) {
+func EnsurePreActiveComponents(c client.Client, teamName, namespace string, skipTest bool) (q *s2hv1beta1.Queue, err error) {
 	q = &s2hv1beta1.Queue{
 		ObjectMeta: metav1.ObjectMeta{
 			Name:      string(s2hv1beta1.EnvPreActive),
 			Namespace: namespace,
 		},
 		Spec: s2hv1beta1.QueueSpec{
-			Type:     s2hv1beta1.QueueTypePreActive,
-			TeamName: teamName,
+			Type:           s2hv1beta1.QueueTypePreActive,
+			TeamName:       teamName,
+			SkipTestRunner: skipTest,
 		},
 	}
 

internal/samsahai/activepromotion/collect_result.go

@@ -13,14 +13,14 @@ import (
 func (c *controller) collectResult(ctx context.Context, atpComp *s2hv1beta1.ActivePromotion) error {
 	teamName := atpComp.Name
 	targetNs := c.getTargetNamespace(atpComp)
-	q, err := queue.EnsurePreActiveComponents(c.client, teamName, targetNs)
+	q, err := queue.EnsurePreActiveComponents(c.client, teamName, targetNs, atpComp.Spec.SkipTestRunner)
 	if err != nil {
 		return errors.Wrapf(err, "cannot ensure pre-active components, namespace %s", targetNs)
 	}
 
 	if !atpComp.IsActivePromotionCanceled() && !atpComp.Status.IsTimeout {
 		// to save pre-active queue after pre-active queue finished
-		q, err = c.ensurePreActiveComponentsTested(teamName, targetNs)
+		q, err = c.ensurePreActiveComponentsTested(teamName, targetNs, atpComp.Spec.SkipTestRunner)
 		if err != nil {
 			return errors.Wrapf(err, "cannot ensure pre-active components finished, namespace %s", targetNs)
 		}

internal/samsahai/activepromotion/deploy.go

@@ -12,7 +12,7 @@ import (
 func (c *controller) deployComponentsToTargetNamespace(atpComp *s2hv1beta1.ActivePromotion) error {
 	teamName := atpComp.Name
 	targetNs := c.getTargetNamespace(atpComp)
-	q, err := c.ensurePreActiveComponentsDeployed(teamName, targetNs)
+	q, err := c.ensurePreActiveComponentsDeployed(teamName, targetNs, atpComp.Spec.SkipTestRunner)
 	if err != nil {
 		return err
 	}
@@ -35,8 +35,8 @@ func (c *controller) deployComponentsToTargetNamespace(atpComp *s2hv1beta1.Activ
 	return nil
 }
 
-func (c *controller) ensurePreActiveComponentsDeployed(teamName, targetNs string) (*s2hv1beta1.Queue, error) {
-	q, err := queue.EnsurePreActiveComponents(c.client, teamName, targetNs)
+func (c *controller) ensurePreActiveComponentsDeployed(teamName, targetNs string, skipTest bool) (*s2hv1beta1.Queue, error) {
+	q, err := queue.EnsurePreActiveComponents(c.client, teamName, targetNs, skipTest)
 	if err != nil {
 		return nil, errors.Wrapf(err, "cannot ensure pre-active components, namespace %s", targetNs)
 	}
@@ -56,7 +56,7 @@ func (c *controller) ensurePreActiveComponentsDeployed(teamName, targetNs string
 func (c *controller) testPreActiveEnvironment(atpComp *s2hv1beta1.ActivePromotion) error {
 	teamName := atpComp.Name
 	targetNs := c.getTargetNamespace(atpComp)
-	q, err := c.ensurePreActiveComponentsTested(teamName, targetNs)
+	q, err := c.ensurePreActiveComponentsTested(teamName, targetNs, atpComp.Spec.SkipTestRunner)
 	if err != nil {
 		return err
 	}
@@ -79,8 +79,8 @@ func (c *controller) testPreActiveEnvironment(atpComp *s2hv1beta1.ActivePromotio
 	return nil
 }
 
-func (c *controller) ensurePreActiveComponentsTested(teamName, targetNs string) (*s2hv1beta1.Queue, error) {
-	q, err := queue.EnsurePreActiveComponents(c.client, teamName, targetNs)
+func (c *controller) ensurePreActiveComponentsTested(teamName, targetNs string, skipTest bool) (*s2hv1beta1.Queue, error) {
+	q, err := queue.EnsurePreActiveComponents(c.client, teamName, targetNs, skipTest)
 	if err != nil {
 		return nil, errors.Wrapf(err, "cannot ensure pre-active components, namespace %s", targetNs)
 	}

internal/staging/start_testrunner.go

@@ -69,8 +69,18 @@ func (c *controller) checkTestTimeout(queue *s2hv1beta1.Queue, testingTimeout me
 
 // checkTestConfig checks test configuration and return testRunner
 func (c *controller) checkTestConfig(queue *s2hv1beta1.Queue) (skipTest bool, testRunner internal.StagingTestRunner, err error) {
-	testConfig := c.getTestConfiguration(queue)
+	if queue.Spec.SkipTestRunner {
+		if err = c.updateTestQueueCondition(
+			queue,
+			v1.ConditionTrue,
+			"skip running test"); err != nil {
+			return
+		}
 
+		return true, nil, nil
+	}
+
+	testConfig := c.getTestConfiguration(queue)
 	if testConfig == nil {
 		if err = c.updateTestQueueCondition(
 			queue,

test/e2e/staging/ctrl.go

@@ -468,9 +468,10 @@ var _ = Describe("[e2e] Staging controller", func() {
 
 		By("Ensure Pre Active Components")
 		redisServiceName := fmt.Sprintf("%s-redis-master", namespace)
+		skipTest := true
 
 		err = wait.PollImmediate(2*time.Second, deployTimeout, func() (ok bool, err error) {
-			queue, err := queue.EnsurePreActiveComponents(client, teamName, namespace)
+			queue, err := queue.EnsurePreActiveComponents(client, teamName, namespace, skipTest)
 			if err != nil {
 				logger.Error(err, "cannot ensure pre-active components")
 				return false, nil
@@ -497,7 +498,7 @@ var _ = Describe("[e2e] Staging controller", func() {
 		})
 		Expect(err).NotTo(HaveOccurred(), "Ensure Pre Active error")
 
-		q, err := queue.EnsurePreActiveComponents(client, teamName, namespace)
+		q, err := queue.EnsurePreActiveComponents(client, teamName, namespace, skipTest)
 		Expect(err).NotTo(HaveOccurred())
 		Expect(q.IsDeploySuccess()).To(BeTrue())
 		Expect(q.IsTestSuccess()).To(BeTrue())