Update wkflows

TykTechnologies · Jun 1, 2024 · d2b9265 · d2b9265
1 parent 3f5d5b9
commit d2b9265
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 16 deletions.
diff --git a/.github/workflows/full_performance_test.yml b/.github/workflows/full_performance_test.yml
@@ -168,15 +168,10 @@ jobs:
           echo "#
           echo "###################################################################
 
-      - name: Grafana timestamp test snapshot
-        if: ${{ inputs.tests_timestamp_enabled == true }}
+      - name: Test Grafana Snapshot
+        if: ${{ inputs.tests_timestamp_enabled == true || inputs.tests_httpbin_enabled == true }}
         run: |
-          kubectl logs -n dependencies $(kubectl get pods -n dependencies --selector=job-name=snapshot-job-timestamp -o jsonpath='{.items[-1].metadata.name}') --tail=1
-
-      - name: Grafana httpbin test snapshot
-        if: ${{ inputs.tests_httpbin_enabled == true }}
-        run: |
-          kubectl logs -n dependencies $(kubectl get pods -n dependencies --selector=job-name=snapshot-job-httpbin -o jsonpath='{.items[-1].metadata.name}') --tail=1
+          kubectl logs -n dependencies $(kubectl get pods -n dependencies --selector=app=snapshot-job -o jsonpath='{.items[-1].metadata.name}') --tail=1
 
       - name: Destroy Tests
         run: |

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -148,12 +148,7 @@ jobs:
           echo "#
           echo "###################################################################
 
-      - name: Grafana timestamp test snapshot
-        if: ${{ inputs.tests_timestamp_enabled == true }}
+      - name: Test Grafana Snapshot
+        if: ${{ inputs.tests_timestamp_enabled == true || inputs.tests_httpbin_enabled == true }}
         run: |
-          kubectl logs -n dependencies $(kubectl get pods -n dependencies --selector=job-name=snapshot-job-timestamp -o jsonpath='{.items[-1].metadata.name}') --tail=1
-
-      - name: Grafana httpbin test snapshot
-        if: ${{ inputs.tests_httpbin_enabled == true }}
-        run: |
-          kubectl logs -n dependencies $(kubectl get pods -n dependencies --selector=job-name=snapshot-job-httpbin -o jsonpath='{.items[-1].metadata.name}') --tail=1
+          kubectl logs -n dependencies $(kubectl get pods -n dependencies --selector=app=snapshot-job -o jsonpath='{.items[-1].metadata.name}') --tail=1