test: Refactor e2e flow to reduce flaky tests (#72)

Ensure Tekton stack is ready before start e2e tests

Signed-off-by: Sergiy Kulanov <[email protected]>
Change-Id: I3b872ae06fc056b1c39a81d6fbc0bcc8543625d8

kuttl-test.yaml

@@ -3,7 +3,7 @@ kind: TestSuite
 testDirs:
   - ./tests/e2e/
 skipClusterDelete: false
-timeout: 120
+timeout: 180
 parallel: 3
 commands:
   # Install Cert manager which is used by Interceptor
@@ -28,6 +28,3 @@ commands:
     namespaced: false
   - command: helm dependency update ./charts/pipelines-library
     namespaced: true
-  # We have all the requered checks, but let's wait a bit to make sure all the webhooks are registered
-  - command: sleep 20
-    namespaced: false

tests/e2e/gerrit/00-assert.yaml

@@ -42,28 +42,3 @@ metadata:
   namespace: tekton-pipelines
 status:
   readyReplicas: 1
-
----
-apiVersion: tekton.dev/v1
-kind: PipelineRun
-metadata:
-  name: check-readiness
-status:
-  conditions:
-    - reason: Succeeded
-      status: 'True'
-      type: Succeeded
-  pipelineSpec:
-    tasks:
-      - name: check
-        taskSpec:
-          metadata:
-            labels:
-              app: example
-          steps:
-            - computeResources: {}
-              image: alpine:3.18.4
-              name: echo
-              script: |
-                #!/usr/bin/env sh
-                echo "I'm ok!"

tests/e2e/gerrit/01-assert.yaml

@@ -1,22 +1,23 @@
-apiVersion: apps/v1
-kind: Deployment
+apiVersion: tekton.dev/v1
+kind: PipelineRun
 metadata:
-  name: edp-tekton-dashboard
+  name: check-readiness
 status:
-  readyReplicas: 1
-
----
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: edp-tekton-interceptor
-status:
-  readyReplicas: 1
-
----
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: el-gerrit-listener
-status:
-  readyReplicas: 1
+  conditions:
+    - reason: Succeeded
+      status: 'True'
+      type: Succeeded
+  pipelineSpec:
+    tasks:
+      - name: check
+        taskSpec:
+          metadata:
+            labels:
+              app: example
+          steps:
+            - computeResources: {}
+              image: alpine:3.18.4
+              name: echo
+              script: |
+                #!/usr/bin/env sh
+                echo "I'm ok!"

tests/e2e/gerrit/01-install.yaml

@@ -1,11 +1,18 @@
-apiVersion: kuttl.dev/v1beta1
-kind: TestStep
-commands:
-  - command: |
-      helm install tekton-e2e ../../../charts/pipelines-library --set interceptor.image.repository=${E2E_IMAGE_REPOSITORY} --set interceptor.image.tag=${E2E_IMAGE_TAG}
-        --set global.dnsWildCard=example.com
-        --set global.gitProvider=gerrit
-        --set global.dockerRegistry.type=harbor
-        --set global.dockerRegistry.url=harbor.example.com
-        --replace --wait
-    namespaced: true
+apiVersion: tekton.dev/v1
+kind: PipelineRun
+metadata:
+  name: check-readiness
+spec:
+  pipelineSpec:
+    tasks:
+      - name: check
+        taskSpec:
+          metadata:
+            labels:
+              app: "example"
+          steps:
+            - name: echo
+              image: alpine:3.18.4
+              script: |
+                #!/usr/bin/env sh
+                echo "I'm ok!"

tests/e2e/gerrit/02-assert.yaml

@@ -0,0 +1,22 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: edp-tekton-dashboard
+status:
+  readyReplicas: 1
+
+---
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: edp-tekton-interceptor
+status:
+  readyReplicas: 1
+
+---
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: el-gerrit-listener
+status:
+  readyReplicas: 1

tests/e2e/gerrit/02-install.yaml

@@ -0,0 +1,11 @@
+apiVersion: kuttl.dev/v1beta1
+kind: TestStep
+commands:
+  - command: |
+      helm install tekton-e2e ../../../charts/pipelines-library --set interceptor.image.repository=${E2E_IMAGE_REPOSITORY} --set interceptor.image.tag=${E2E_IMAGE_TAG}
+        --set global.dnsWildCard=example.com
+        --set global.gitProvider=gerrit
+        --set global.dockerRegistry.type=harbor
+        --set global.dockerRegistry.url=harbor.example.com
+        --replace --wait
+    namespaced: true

tests/e2e/github/00-assert.yaml

@@ -42,28 +42,3 @@ metadata:
   namespace: tekton-pipelines
 status:
   readyReplicas: 1
-
----
-apiVersion: tekton.dev/v1
-kind: PipelineRun
-metadata:
-  name: check-readiness
-status:
-  conditions:
-    - reason: Succeeded
-      status: 'True'
-      type: Succeeded
-  pipelineSpec:
-    tasks:
-      - name: check
-        taskSpec:
-          metadata:
-            labels:
-              app: example
-          steps:
-            - computeResources: {}
-              image: alpine:3.18.4
-              name: echo
-              script: |
-                #!/usr/bin/env sh
-                echo "I'm ok!"

tests/e2e/github/01-assert.yaml

@@ -1,22 +1,23 @@
-apiVersion: apps/v1
-kind: Deployment
+apiVersion: tekton.dev/v1
+kind: PipelineRun
 metadata:
-  name: edp-tekton-dashboard
+  name: check-readiness
 status:
-  readyReplicas: 1
-
----
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: edp-tekton-interceptor
-status:
-  readyReplicas: 1
-
----
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: el-github-listener
-status:
-  readyReplicas: 1
+  conditions:
+    - reason: Succeeded
+      status: 'True'
+      type: Succeeded
+  pipelineSpec:
+    tasks:
+      - name: check
+        taskSpec:
+          metadata:
+            labels:
+              app: example
+          steps:
+            - computeResources: {}
+              image: alpine:3.18.4
+              name: echo
+              script: |
+                #!/usr/bin/env sh
+                echo "I'm ok!"

tests/e2e/github/01-install.yaml

@@ -1,11 +1,18 @@
-apiVersion: kuttl.dev/v1beta1
-kind: TestStep
-commands:
-  - command: |
-      helm install tekton-e2e ../../../charts/pipelines-library --set interceptor.image.repository=${E2E_IMAGE_REPOSITORY} --set interceptor.image.tag=${E2E_IMAGE_TAG}
-        --set global.dnsWildCard=example.com
-        --set global.gitProvider=github
-        --set global.dockerRegistry.type=harbor
-        --set global.dockerRegistry.url=harbor.example.com
-        --replace --wait
-    namespaced: true
+apiVersion: tekton.dev/v1
+kind: PipelineRun
+metadata:
+  name: check-readiness
+spec:
+  pipelineSpec:
+    tasks:
+      - name: check
+        taskSpec:
+          metadata:
+            labels:
+              app: "example"
+          steps:
+            - name: echo
+              image: alpine:3.18.4
+              script: |
+                #!/usr/bin/env sh
+                echo "I'm ok!"

tests/e2e/github/02-assert.yaml

@@ -0,0 +1,22 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: edp-tekton-dashboard
+status:
+  readyReplicas: 1
+
+---
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: edp-tekton-interceptor
+status:
+  readyReplicas: 1
+
+---
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: el-github-listener
+status:
+  readyReplicas: 1

tests/e2e/github/02-install.yaml

@@ -0,0 +1,11 @@
+apiVersion: kuttl.dev/v1beta1
+kind: TestStep
+commands:
+  - command: |
+      helm install tekton-e2e ../../../charts/pipelines-library --set interceptor.image.repository=${E2E_IMAGE_REPOSITORY} --set interceptor.image.tag=${E2E_IMAGE_TAG}
+        --set global.dnsWildCard=example.com
+        --set global.gitProvider=github
+        --set global.dockerRegistry.type=harbor
+        --set global.dockerRegistry.url=harbor.example.com
+        --replace --wait
+    namespaced: true

tests/e2e/gitlab/00-assert.yaml

@@ -42,28 +42,3 @@ metadata:
   namespace: tekton-pipelines
 status:
   readyReplicas: 1
-
----
-apiVersion: tekton.dev/v1
-kind: PipelineRun
-metadata:
-  name: check-readiness
-status:
-  conditions:
-    - reason: Succeeded
-      status: 'True'
-      type: Succeeded
-  pipelineSpec:
-    tasks:
-      - name: check
-        taskSpec:
-          metadata:
-            labels:
-              app: example
-          steps:
-            - computeResources: {}
-              image: alpine:3.18.4
-              name: echo
-              script: |
-                #!/usr/bin/env sh
-                echo "I'm ok!"