fix integration tests (#3269)

.github/workflows/integration-testing.yaml

@@ -190,7 +190,7 @@ jobs:
       steps:
         - name: Wait 22 minutes for promless data collection
           run: |
-            sleep 1320
+            sleep 1320 # 22 minutes
     
     run-comparison-tests:
       needs: [wait_for_image_ready, build-test-stack, build-test-stack-promless, wait-for-data-collection]
@@ -203,10 +203,24 @@ jobs:
         comparison_namespace: "${{ needs.wait_for_image_ready.outputs.NAMESPACE }}-promless"
         target_branch: "${{ github.event.pull_request.head.ref || 'main' }}"
         comparison: true
+    
+    print-outputs:
+      needs: [run-comparison-tests, run-tests]
+      if: ${{ (always() && !cancelled()) && ( github.event.event_name == 'schedule'  || github.event_name == 'push' || github.event_name == 'merge_group' || (github.event_name == 'pull_request_target'  && needs.check_actor_permissions.outputs.ismaintainer == 'true')) }}
+      runs-on: ubuntu-latest
+      permissions: {}
+      steps:
+        - name: Print outputs
+          run: |
+            echo "NAMESPACE: ${{ needs.wait_for_image_ready.outputs.NAMESPACE }}"
+            echo "COMPARISON_NAMESPACE: ${{ needs.wait_for_image_ready.outputs.NAMESPACE }}-promless"
+            echo "TARGET_BRANCH: ${{ github.event.pull_request.head.ref || 'main' }}"
+            echo "PASSED COMPARISON: ${{ needs.run-comparison-tests.outputs.passed }}"
+            echo "PASSED INTEGRATION: ${{ needs.run-tests.outputs.passed }}"
            
     hold-on-failure:
       needs: [wait_for_image_ready, run-tests, run-comparison-tests]
-      if: ${{ needs.run-tests.outputs.passed == 'false' || needs.run-comparison-tests.outputs.passed == 'false' }}
+      if: ${{ always() && (needs.run-tests.outputs.passed == 'false' || needs.run-comparison-tests.outputs.passed == 'false')}} 
       runs-on: ubuntu-latest
       permissions: {}
       steps:
@@ -238,7 +252,7 @@ jobs:
             namespace: "${{ needs.wait_for_image_ready.outputs.NAMESPACE }}-promless"
 
     check-success:
-        needs: [noop-tests, run-tests]
+        needs: [noop-tests, run-tests, run-comparison-tests]
         permissions: {}
         runs-on: ubuntu-latest
         if: ${{ always() }}
@@ -249,6 +263,8 @@ jobs:
               IS_NOOP: ${{ needs.noop-tests.outputs.is_noop }}
               PASSED: ${{ needs.run-tests.outputs.passed }}
             run: |
+              echo "IS_NOOP: $IS_NOOP"
+              echo "PASSED: $PASSED"
               if [[ "$IS_NOOP" == "true" ]]; then
                 echo "No-op tests, skipping success check"
                 exit 0
@@ -259,11 +275,6 @@ jobs:
                 exit 1
               fi
               
-#              if [[ "${{ needs.run-comparison-tests.outputs.passed }}" != "true" ]]; then
-#                echo "One or more comparison tests failed"
-#                exit 1
-#              fi
-              
               echo "All integration tests passed"
               exit 0
 

MAINTAINERS.md

@@ -3,7 +3,6 @@
 Official list of [OpenCost Maintainers](https://github.com/orgs/opencost/teams/opencost-maintainers). [OpenCost Committers](https://github.com/orgs/opencost/teams/opencost-committers) are granted Triage permissions for the OpenCost repositories. The [GOVERNANCE.md](https://github.com/opencost/opencost/blob/develop/GOVERNANCE.md) describes the process for becoming a committer and maintainer of the project.
 
 ## Maintainers
-
 | Maintainer | GitHub ID | Affiliation | Email |
 | --------------- | --------- | ----------- | ----------- |
 | Ajay Tripathy | @AjayTripathy | IBM | <ajay.tripathy@ibm.com> |
@@ -21,4 +20,4 @@ We would like to acknowledge previous committers and their huge contributions to
 | --------------- | --------- | ----------- | ----------- |
 | Michael Dresser | @michaelmdresser | Kubecost (former) | <michaelmdresser@gmail.com> |
 | Matt Ray | @mattray | Kubecost (former) | <mattray@kubecost.com> |
-| Thomas Evans | @teevans | Kubecost (former) | <thomas@kubecost.com> |
+| Thomas Evans | @teevans | Kubecost (former) | <thomas@kubecost.com> |