test: refactor kuttl test using env var

Signed-off-by: realanna <[email protected]> test: clean version Signed-off-by: realanna <[email protected]> test: clean version Signed-off-by: realanna <[email protected]> test: rename without - Signed-off-by: realanna <[email protected]> test: rename without - Signed-off-by: realanna <[email protected]> test: rename job Signed-off-by: realanna <[email protected]> test: rename job Signed-off-by: realanna <[email protected]> test: refactor kuttl test using env var Signed-off-by: realanna <[email protected]> test: refactor kuttl test using env var Signed-off-by: realanna <[email protected]> test: refactor kuttl test using env var Signed-off-by: realanna <[email protected]>
keptn · Apr 12, 2023 · 44c845c · 44c845c
1 parent 72396cd
commit 44c845c
Show file tree

Hide file tree

Showing 7 changed files with 50 additions and 33 deletions.
diff --git a/test/integration/expose-keptn-metric/00-assert.yaml b/test/integration/expose-keptn-metric/00-assert.yaml
@@ -1,9 +1,4 @@
-apiVersion: batch/v1
-kind: Job
-metadata:
-  name: test
-status:
-  conditions:
-    - type: Complete
-      status: 'True'
-  succeeded: 1
+apiVersion: kuttl.dev/v1beta1
+kind: TestAssert
+commands:
+  - script: PREFIX="kuttl-test-" && NAME=$(echo $NAMESPACE | sed "s/^$PREFIX//" ) && kubectl wait --for=condition=complete job $NAME-1
diff --git a/test/integration/expose-keptn-metric/00-teststep.yaml b/test/integration/expose-keptn-metric/00-teststep.yaml
@@ -0,0 +1,11 @@
+apiVersion: kuttl.dev/v1
+kind: TestStep
+commands: #generating job and metric based on namespace to avoid interference between runs
+  - script: |
+      export NAME=$( echo $NAMESPACE | tr -d -)
+      echo "installing first job"
+      envsubst < no-metrics.yaml | kubectl apply -f -
+  - script: |
+      export NAME=$( echo $NAMESPACE | tr -d -)
+      echo "asserting first job"  
+      kubectl wait --for=condition=complete job $NAME-job1 -n $NAMESPACE
diff --git a/test/integration/expose-keptn-metric/01-assert.yaml b/test/integration/expose-keptn-metric/01-assert.yaml
diff --git a/test/integration/expose-keptn-metric/01-teststep.yaml b/test/integration/expose-keptn-metric/01-teststep.yaml
@@ -0,0 +1,12 @@
+apiVersion: kuttl.dev/v1
+kind: TestStep
+commands:
+  - script: | #generating job and metric based on namespace to avoid interference between runs
+      export NAME=$( echo $NAMESPACE | tr -d -)            
+      echo "installing second job"
+      envsubst < metrics.yaml  | kubectl apply -f -
+
+  - script: | #generating job assertion file
+      export NAME=$( echo $NAMESPACE | tr -d -)
+      echo "asserting second job"    
+      kubectl wait --for=condition=complete job $NAME-job2 -n $NAMESPACE
diff --git a/test/integration/expose-keptn-metric/02-teststep.yaml b/test/integration/expose-keptn-metric/02-teststep.yaml
diff --git a/...ation/expose-keptn-metric/01-install.yaml → ...egration/expose-keptn-metric/metrics.yaml b/...ation/expose-keptn-metric/01-install.yaml → ...egration/expose-keptn-metric/metrics.yaml
@@ -1,8 +1,8 @@
 apiVersion: metrics.keptn.sh/v1alpha2
 kind: KeptnMetric
 metadata:
-  name: keptnmetric-sample
-  namespace: keptn-lifecycle-toolkit-system
+  name: $NAME
+  namespace: $NAMESPACE
 spec:
   provider:
     name: "provider"
@@ -12,7 +12,8 @@ spec:
 apiVersion: batch/v1
 kind: Job
 metadata:
-  name: test2
+  name: $NAME-job2
+  namespace: $NAMESPACE
 spec:
   backoffLimit: 5
   template:
@@ -25,7 +26,8 @@ spec:
             - -ec
             - |
               curl -s metrics-operator-service.keptn-lifecycle-toolkit-system.svc.cluster.local:9999/metrics > ~/out.txt
-              if grep -Fxq "# HELP keptnmetric_sample keptnmetric-sample" ~/out.txt
+              echo ~/out.txt
+              if grep -Fxq "# HELP $NAME $NAME" ~/out.txt
               then
                 exit 0
               fi
@@ -37,8 +39,9 @@ spec:
             - /bin/sh
             - -ec
             - |
-              curl -s metrics-operator-service.keptn-lifecycle-toolkit-system.svc.cluster.local:9999/api/v1/metrics/keptn-lifecycle-toolkit-system/keptnmetric-sample > ~/out.txt
-              if grep -F "keptnmetric-sample" ~/out.txt
+              curl -s metrics-operator-service.keptn-lifecycle-toolkit-system.svc.cluster.local:9999/api/v1/metrics/$NAMESPACE/$NAME > ~/out.txt
+              echo ~/out.txt
+              if grep -F "$NAME" ~/out.txt
               then
                 exit 0
               fi

diff --git a/...ation/expose-keptn-metric/00-install.yaml → ...ation/expose-keptn-metric/no-metrics.yaml b/...ation/expose-keptn-metric/00-install.yaml → ...ation/expose-keptn-metric/no-metrics.yaml
@@ -1,9 +1,10 @@
 apiVersion: batch/v1
 kind: Job
 metadata:
-  name: test
+  name: $NAME-job1
+  namespace: $NAMESPACE
 spec:
-  backoffLimit: 0
+  backoffLimit: 3
   template:
     spec:
       containers:
@@ -14,19 +15,27 @@ spec:
             - -ec
             - |
               curl -s metrics-operator-service.keptn-lifecycle-toolkit-system.svc.cluster.local:9999/metrics > ~/out.txt
-              if grep -Fxq "# HELP keptnmetric_sample keptnmetric-sample" ~/out.txt
+              cat ~/out.txt
+              if grep -Fxq "# HELP $NAME $NAME" ~/out.txt
               then
+                cat ~/out.txt
+                sleep 55 
                 exit 1
               fi
+              exit 0
         - name: test-api-endpoint
           image: curlimages/curl:8.00.1
           args:
             - /bin/sh
             - -ec
             - |
-              curl -s metrics-operator-service.keptn-lifecycle-toolkit-system.svc.cluster.local:9999/api/v1/metrics//keptnmetric-sample > ~/out.txt
-              if grep -F "keptnmetric-sample" ~/out.txt
+              curl -s metrics-operator-service.keptn-lifecycle-toolkit-system.svc.cluster.local:9999/api/v1/metrics/$NAMESPACE/$NAME > ~/out.txt
+              cat ~/out.txt
+              if grep -F "$NAME" ~/out.txt
               then
+                cat ~/out.txt
+                sleep 55 
                 exit 1
               fi
+              exit 0
       restartPolicy: Never