test: clean version

Signed-off-by: realanna <[email protected]>

test/integration/expose-keptn-metric/00-teststep.yaml

@@ -1,5 +1,11 @@
 apiVersion: kuttl.dev/v1
 kind: TestStep
 commands: #generating job and metric based on namespace to avoid interference between runs
-  - script: ./applyjob.sh no-metrics.yaml
-  - script: ./assertjob.sh job1
+  - 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

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

test/integration/expose-keptn-metric/metrics.yaml

@@ -2,7 +2,7 @@ apiVersion: metrics.keptn.sh/v1alpha2
 kind: KeptnMetric
 metadata:
   name: $NAME
-  namespace: keptn-lifecycle-toolkit-system
+  namespace: $NAMESPACE
 spec:
   provider:
     name: "provider"
@@ -39,7 +39,7 @@ spec:
             - /bin/sh
             - -ec
             - |
-              curl -s metrics-operator-service.keptn-lifecycle-toolkit-system.svc.cluster.local:9999/api/v1/metrics/keptn-lifecycle-toolkit-system//$NAME > ~/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

test/integration/expose-keptn-metric/no-metrics.yaml

@@ -29,7 +29,7 @@ spec:
             - /bin/sh
             - -ec
             - |
-              curl -s metrics-operator-service.keptn-lifecycle-toolkit-system.svc.cluster.local:9999/api/v1/metrics//{$NAME} > ~/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