From b0e0fbf75b53331a685122707996ab4e664044ee Mon Sep 17 00:00:00 2001
From: realanna <anna.reale@dynatrace.com>
Date: Thu, 13 Apr 2023 09:03:49 +0200
Subject: [PATCH] test: review

Signed-off-by: realanna <anna.reale@dynatrace.com>
---
 test/integration/expose-keptn-metric/00-teststep.yaml         | 2 +-
 test/integration/expose-keptn-metric/01-teststep.yaml         | 2 +-
 .../{metrics.yaml => job-existing-metric.yaml}                | 0
 .../{no-metrics.yaml => job-no-metric.yaml}                   | 4 +---
 4 files changed, 3 insertions(+), 5 deletions(-)
 rename test/integration/expose-keptn-metric/{metrics.yaml => job-existing-metric.yaml} (100%)
 rename test/integration/expose-keptn-metric/{no-metrics.yaml => job-no-metric.yaml} (93%)

diff --git a/test/integration/expose-keptn-metric/00-teststep.yaml b/test/integration/expose-keptn-metric/00-teststep.yaml
index fbe2bc01a5..5cccc5605b 100644
--- a/test/integration/expose-keptn-metric/00-teststep.yaml
+++ b/test/integration/expose-keptn-metric/00-teststep.yaml
@@ -4,7 +4,7 @@ commands: # generating job and metric based on namespace to avoid interference b
   - script: |
       export NAME=$( echo $NAMESPACE | tr -d -)
       echo "installing first job"
-      envsubst < no-metrics.yaml | kubectl apply -f -
+      envsubst < job-no-metric.yaml | kubectl apply -f -
   - script: |
       export NAME=$( echo $NAMESPACE | tr -d -)
       echo "asserting first job"
diff --git a/test/integration/expose-keptn-metric/01-teststep.yaml b/test/integration/expose-keptn-metric/01-teststep.yaml
index 430c5ae60b..7e115c93ec 100644
--- a/test/integration/expose-keptn-metric/01-teststep.yaml
+++ b/test/integration/expose-keptn-metric/01-teststep.yaml
@@ -4,7 +4,7 @@ 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 -
+      envsubst < job-existing-metric.yaml  | kubectl apply -f -
 
   - script: | # generating job assertion file
       export NAME=$( echo $NAMESPACE | tr -d -)
diff --git a/test/integration/expose-keptn-metric/metrics.yaml b/test/integration/expose-keptn-metric/job-existing-metric.yaml
similarity index 100%
rename from test/integration/expose-keptn-metric/metrics.yaml
rename to test/integration/expose-keptn-metric/job-existing-metric.yaml
diff --git a/test/integration/expose-keptn-metric/no-metrics.yaml b/test/integration/expose-keptn-metric/job-no-metric.yaml
similarity index 93%
rename from test/integration/expose-keptn-metric/no-metrics.yaml
rename to test/integration/expose-keptn-metric/job-no-metric.yaml
index 9d98b2c701..4dd12ce3fd 100644
--- a/test/integration/expose-keptn-metric/no-metrics.yaml
+++ b/test/integration/expose-keptn-metric/job-no-metric.yaml
@@ -4,7 +4,7 @@ metadata:
   name: $NAME-job1
   namespace: $NAMESPACE
 spec:
-  backoffLimit: 3
+  backoffLimit: 0
   template:
     spec:
       containers:
@@ -19,7 +19,6 @@ spec:
               then
                 exit 1
               fi
-              exit 0
         - name: test-api-endpoint
           image: curlimages/curl:8.00.1
           args:
@@ -31,5 +30,4 @@ spec:
               then
                 exit 1
               fi
-              exit 0
       restartPolicy: Never