Run e2e tests

newrelic · May 14, 2024 · 1c2459d · 1c2459d
1 parent 05c6b3e
commit 1c2459d
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 45 deletions.
diff --git a/.github/workflows/python.yml b/.github/workflows/python.yml
@@ -85,18 +85,20 @@ jobs:
 
       - name: Test
         run: |
-          curl --fail-with-body $(minikube service test-${{ env.INITCONTAINER_LANGUAGE }}-app-service --url -n test-${{ env.INITCONTAINER_LANGUAGE }})
+          curl --fail-with-body $(minikube service test-app-${{ env.INITCONTAINER_LANGUAGE }}-service --url -n test-${{ env.INITCONTAINER_LANGUAGE }})
 
-      # - name: Run e2e-test
-      #   uses: newrelic/newrelic-integration-e2e-action@a97ced80a4841c8c6261d1f9dca6706b1d89acb1  # 1.11.0
-      #   with:
-      #     retry_seconds: 60
-      #     retry_attempts: 5
-      #     agent_enabled: false
-      #     spec_path: tests/${{ env.INITCONTAINER_LANGUAGE }}/test-specs.yml
-      #     account_id: ${{ secrets.K8S_AGENTS_E2E_ACCOUNT_ID }}
-      #     api_key: ${{ secrets.K8S_AGENTS_E2E_API_KEY }}
-      #     license_key: ${{ secrets.K8S_AGENTS_E2E_LICENSE_KEY }}
+      - name: Run e2e-test
+        uses: newrelic/newrelic-integration-e2e-action@a97ced80a4841c8c6261d1f9dca6706b1d89acb1  # 1.11.0
+        with:
+          # retry_seconds: 60
+          # retry_attempts: 5
+          retry_seconds: 5
+          retry_attempts: 1
+          agent_enabled: false
+          spec_path: tests/${{ env.INITCONTAINER_LANGUAGE }}/test-specs.yml
+          account_id: ${{ secrets.K8S_AGENTS_E2E_ACCOUNT_ID }}
+          api_key: ${{ secrets.K8S_AGENTS_E2E_API_KEY }}
+          license_key: ${{ secrets.NEW_RELIC_LICENSE_KEY }}
 
   publish:
     if: ${{ github.event_name == 'release' }}

diff --git a/test.sh b/test.sh
diff --git a/tests/python/test-specs.yml b/tests/python/test-specs.yml
@@ -5,18 +5,10 @@ scenarios:
   - description: |
       This scenario will verify that transactions are reported by the 
     before:
-      - kubectl create namespace nr-${SCENARIO_TAG}
-      - kubectl apply -f ./customresource.yaml -n nr-${SCENARIO_TAG}
-      - kubectl apply -f ./test_app_deployment.yaml -n nr-${SCENARIO_TAG}
-      - sleep 10
-      - kubectl wait --for=condition=Ready --namespace nr-${SCENARIO_TAG} --all pods
-      - curl --fail-with-body $(minikube service test-app-python-service --url -n nr-${SCENARIO_TAG})
-    after:
-      - kubectl delete -f ./customresource.yaml -n nr-${SCENARIO_TAG}
-      - kubectl delete -f ./test_app_deployment.yaml -n nr-${SCENARIO_TAG}
+      - curl --fail-with-body $(minikube service test-app-python-service --url -n test-python)
     tests:
       nrqls:
-        - query: FROM Metric SELECT latest(something) AS 'start_time' WHERE metricName = 'k8s.persistentvolume.createdAt' AND appName = 'k8s-e2e-test-app-${SCENARIO_TAG:-0}'
+        - query: FROM Transaction SELECT latest(something) AS 'start_time' WHERE appName = 'k8s-e2e-test-app-python'
           expected_results:
             - key: "start_time"
               lowerBoundedValue: 0.0