chore: use chainsaw wait operation (keptn#3155)

Signed-off-by: Charles-Edouard Brétéché <[email protected]> Signed-off-by: vickysomtee <[email protected]>
Vickysomtee · Apr 22, 2024 · ac83090 · ac83090
1 parent 1db7bac
commit ac83090
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 10 deletions.
diff --git a/test/chainsaw/integration/expose-keptn-metric/chainsaw-test.yaml b/test/chainsaw/integration/expose-keptn-metric/chainsaw-test.yaml
@@ -14,12 +14,13 @@ spec:
               export SVCNAME=$( kubectl get svc -n keptn-system -l control-plane=metrics-operator -ojsonpath="{ .items[0].metadata.name }" )
               echo "installing first job pointing to ${SVCNAME}"
               envsubst < job-no-metric.yaml | kubectl apply -f -
-        - script:
+        - wait:
             timeout: 5m
-            content: |
-              export NAME=$( echo $NAMESPACE | tr -d -)
-              echo "asserting first job: ${NAME}"
-              kubectl wait --for=condition=complete job $NAME-job1 -n $NAMESPACE
+            resource: job
+            selector: kind=no-metric
+            for:
+              condition:
+                name: complete
     - name: step-01
       try:
         - script:
@@ -29,9 +30,10 @@ spec:
               export SVCNAME=$( kubectl get svc -n keptn-system -l control-plane=metrics-operator -ojsonpath="{ .items[0].metadata.name }" )
               echo "installing second job pointing to ${SVCNAME}"
               envsubst < job-existing-metric.yaml  | kubectl apply -f -
-        - script:
+        - wait:
             timeout: 5m
-            content: |
-              export NAME=$( echo $NAMESPACE | tr -d -)
-              echo "asserting second job: $NAME"
-              kubectl wait --for=condition=complete job $NAME-job2 -n $NAMESPACE
+            resource: job
+            selector: kind=existing-metric
+            for:
+              condition:
+                name: complete
diff --git a/test/chainsaw/integration/expose-keptn-metric/job-existing-metric.yaml b/test/chainsaw/integration/expose-keptn-metric/job-existing-metric.yaml
@@ -14,6 +14,8 @@ kind: Job
 metadata:
   name: $NAME-job2
   namespace: $NAMESPACE
+  labels:
+    kind: existing-metric
 spec:
   backoffLimit: 5
   template:

diff --git a/test/chainsaw/integration/expose-keptn-metric/job-no-metric.yaml b/test/chainsaw/integration/expose-keptn-metric/job-no-metric.yaml
@@ -3,6 +3,8 @@ kind: Job
 metadata:
   name: $NAME-job1
   namespace: $NAMESPACE
+  labels:
+    kind: no-metric
 spec:
   backoffLimit: 0
   template: