fix forwarder tests + update GHA

smartcontractkit · Jun 25, 2024 · b65801c · b65801c
1 parent e61d256
commit b65801c
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 8 deletions.
diff --git a/.github/workflows/on-demand-ocr-soak-test.yml b/.github/workflows/on-demand-ocr-soak-test.yml
@@ -8,7 +8,10 @@ on:
         default: TestOCRSoak
         type: choice
         options:
-          - TestOCRSoak
+          - TestOCRv1Soak
+          - TestOCRv2Soak
+          - TestForwarderOCRv1Soak
+          - TestForwarderOCRv2Soak
           - TestOCRSoak_GethReorgBelowFinality_FinalityTagDisabled
           - TestOCRSoak_GethReorgBelowFinality_FinalityTagEnabled
           - TestOCRSoak_GasSpike
@@ -18,7 +21,7 @@ on:
       base64Config:
         description: base64-ed config
         required: true
-        type: string      
+        type: string
       slackMemberID:
         description: Slack Member ID (Not your @)
         required: true
@@ -78,7 +81,7 @@ jobs:
           echo "### chainlink-tests image tag for this test run :ship:" >>$GITHUB_STEP_SUMMARY
           echo "\`${GITHUB_SHA}\`" >>$GITHUB_STEP_SUMMARY
           echo "### Networks on which test was run" >>$GITHUB_STEP_SUMMARY
-          echo "\`${{ env.NETWORKS }}\`" >>$GITHUB_STEP_SUMMARY          
+          echo "\`${{ env.NETWORKS }}\`" >>$GITHUB_STEP_SUMMARY
       - name: Build Image
         uses: ./.github/actions/build-test-image
         with:

diff --git a/integration-tests/soak/forwarder_ocr_test.go b/integration-tests/soak/forwarder_ocr_test.go
@@ -13,17 +13,13 @@ import (
 )
 
 func TestForwarderOCRv1Soak(t *testing.T) {
-	//nolint:revive
-	t.Fatalf("This test is disabled because the implementation is broken")
 	config, err := tc.GetConfig("Soak", tc.ForwarderOcr)
 	require.NoError(t, err, "Error getting config")
 
 	executeForwarderOCRSoakTest(t, &config)
 }
 
 func TestForwarderOCRv2Soak(t *testing.T) {
-	//nolint:revive
-	t.Fatalf("This test is disabled because the implementation is broken")
 	config, err := tc.GetConfig("Soak", tc.ForwarderOcr2)
 	require.NoError(t, err, "Error getting config")
 

diff --git a/integration-tests/testsetups/ocr.go b/integration-tests/testsetups/ocr.go
@@ -311,7 +311,9 @@ func (o *OCRSoakTest) Setup(ocrTestConfig tt.OcrTestConfig) {
 			require.NoError(o.t, err, "Accepting Authorize Receivers on Operator shouldn't fail")
 			actions.TrackForwarder(o.t, o.seth, forwarders[i], o.workerNodes[i])
 		}
-	} else if o.OCRVersion == "1" {
+	}
+
+	if o.OCRVersion == "1" {
 		if o.OperatorForwarderFlow {
 			o.ocrV1Instances, err = actions.DeployOCRContractsForwarderFlow(
 				o.log,