Fix(328): ci testing workflow issue when no tests are run (#329)

* fix: ci testing workflow issue when no tests are run * feat: set ssl as false and gssEncMode as disable in tx-exclusion-api integration test * fix: remove unnecessary conditions in testing workflow --------- Co-authored-by: jonesho <jones.ho@consensys.net>
Consensys · Nov 22, 2024 · d4f3f27 · d4f3f27
1 parent df9370b
commit d4f3f27
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 22 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -20,7 +20,6 @@ jobs:
       traces-api-facade: ${{ steps.filter.outputs.traces-api-facade }}
       transaction-exclusion-api: ${{ steps.filter.outputs.transaction-exclusion-api }}
       finalized-tag-updater: ${{ steps.filter.outputs.finalized-tag-updater }}
-      no-changes: ${{ steps.filter.outputs.coordinator == 'false' && steps.filter.outputs.postman == 'false' && steps.filter.outputs.prover == 'false' && steps.filter.outputs.traces-api-facade == 'false' && steps.filter.outputs.transaction-exclusion-api == 'false' }}
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -167,7 +166,7 @@ jobs:
 
   testing:
     needs: [ store-image-name-and-tags, filter-commit-changes, check-and-tag-images ]
-    if: ${{ always() && needs.filter-commit-changes.outputs.no-changes == 'false' }}
+    if: ${{ always() }}
     uses: ./.github/workflows/testing.yml
     with:
       commit_tag: ${{ needs.store-image-name-and-tags.outputs.commit_tag }}
@@ -176,10 +175,6 @@ jobs:
       prover_changed: ${{ needs.filter-commit-changes.outputs.prover }}
       traces_api_facade_changed: ${{ needs.filter-commit-changes.outputs.traces-api-facade }}
       transaction_exclusion_api_changed: ${{ needs.filter-commit-changes.outputs.transaction-exclusion-api }}
-      coordinator_image_tagged: ${{ needs.check-and-tag-images.outputs.image_tagged_coordinator }}
-      postman_image_tagged: ${{ needs.check-and-tag-images.outputs.image_tagged_postman }}
-      traces_api_facade_image_tagged: ${{ needs.check-and-tag-images.outputs.image_tagged_traces_api_facade }}
-      transaction_exclusion_api_image_tagged: ${{ needs.check-and-tag-images.outputs.image_tagged_transaction_exclusion_api }}
     secrets: inherit
 
   run-e2e-tests-geth-tracing:

diff --git a/.github/workflows/testing.yml b/.github/workflows/testing.yml
@@ -21,23 +21,11 @@ on:
       transaction_exclusion_api_changed:
         required: true
         type: string
-      coordinator_image_tagged:
-        required: true
-        type: string
-      postman_image_tagged:
-        required: true
-        type: string
-      traces_api_facade_image_tagged:
-        required: true
-        type: string
-      transaction_exclusion_api_image_tagged:
-        required: true
-        type: string
 
 jobs:
   coordinator:
     uses: ./.github/workflows/coordinator-testing.yml
-    if: ${{ always() && (inputs.coordinator_changed == 'true' || inputs.coordinator_image_tagged != 'true') }}
+    if: ${{ always() && inputs.coordinator_changed == 'true' }}
     with:
       commit_tag: ${{ inputs.commit_tag }}
     secrets: inherit
@@ -49,13 +37,13 @@ jobs:
 
   postman:
     uses: ./.github/workflows/postman-testing.yml
-    if: ${{ always() && (inputs.postman_changed == 'true' || inputs.postman_image_tagged != 'true') }}
+    if: ${{ always() && inputs.postman_changed == 'true' }}
     secrets: inherit
 
   traces-api-facade:
     uses: ./.github/workflows/traces-api-facade-testing.yml
-    if: ${{ always() && (inputs.traces_api_facade_changed == 'true' || inputs.traces_api_facade_image_tagged != 'true') }}
+    if: ${{ always() && inputs.traces_api_facade_changed == 'true' }}
 
   transaction-exclusion-api:
     uses: ./.github/workflows/transaction-exclusion-api-testing.yml
-    if: ${{ always() && (inputs.transaction_exclusion_api_changed == 'true' || inputs.transaction_exclusion_api_image_tagged != 'true') }}
+    if: ${{ always() && inputs.transaction_exclusion_api_changed == 'true' }}
diff --git a/...c/testFixtures/kotlin/net/consensys/zkevm/persistence/db/test/CleanDbTestSuiteParallel.kt b/...c/testFixtures/kotlin/net/consensys/zkevm/persistence/db/test/CleanDbTestSuiteParallel.kt
@@ -26,6 +26,8 @@ abstract class CleanDbTestSuiteParallel {
 
   private fun createDataSource(databaseName: String): DataSource {
     return PGSimpleDataSource().also {
+      it.ssl = false
+      it.gssEncMode = "disable"
       it.serverNames = arrayOf(host)
       it.portNumbers = intArrayOf(port)
       it.databaseName = databaseName