From ff91b194750e58ade95630ccfc586412ad7e97bf Mon Sep 17 00:00:00 2001 From: davidcauchi Date: Tue, 14 Nov 2023 13:17:19 +0100 Subject: [PATCH 1/4] Add testing branch --- integration-tests/go.mod | 2 +- integration-tests/go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/integration-tests/go.mod b/integration-tests/go.mod index a943e1c41a9..a1fab7d3133 100644 --- a/integration-tests/go.mod +++ b/integration-tests/go.mod @@ -22,7 +22,7 @@ require ( github.com/scylladb/go-reflectx v1.0.1 github.com/segmentio/ksuid v1.0.4 github.com/slack-go/slack v0.12.2 - github.com/smartcontractkit/chainlink-testing-framework v1.18.6 + github.com/smartcontractkit/chainlink-testing-framework v1.18.7-0.20231114120758-934255522ff9 github.com/smartcontractkit/chainlink/v2 v2.0.0-00010101000000-000000000000 github.com/smartcontractkit/libocr v0.0.0-20231107151413-13e0202ae8d7 github.com/smartcontractkit/ocr2keepers v0.7.28 diff --git a/integration-tests/go.sum b/integration-tests/go.sum index 5719c36b5a8..e1d10a9d275 100644 --- a/integration-tests/go.sum +++ b/integration-tests/go.sum @@ -2375,8 +2375,8 @@ github.com/smartcontractkit/chainlink-solana v1.0.3-0.20231023133638-72f4e799ab0 github.com/smartcontractkit/chainlink-solana v1.0.3-0.20231023133638-72f4e799ab05/go.mod h1:o0Pn1pbaUluboaK6/yhf8xf7TiFCkyFl6WUOdwqamuU= github.com/smartcontractkit/chainlink-starknet/relayer v0.0.1-beta-test.0.20231024133459-1ef3a11319eb h1:HiluOfEVGOQTM6BTDImOqYdMZZ7qq7fkZ3TJdmItNr8= github.com/smartcontractkit/chainlink-starknet/relayer v0.0.1-beta-test.0.20231024133459-1ef3a11319eb/go.mod h1:/30flFG4L/iCYAFeA3DUzR0xuHSxAMONiWTzyzvsNwo= -github.com/smartcontractkit/chainlink-testing-framework v1.18.6 h1:UL3DxsPflSRALP62rsg5v3NdOsa8RHGhHMUImoWDD6k= -github.com/smartcontractkit/chainlink-testing-framework v1.18.6/go.mod h1:zScXRqmvbyTFUooyLYrOp4+V/sFPUbFJNRc72YmnuIk= +github.com/smartcontractkit/chainlink-testing-framework v1.18.7-0.20231114120758-934255522ff9 h1:AvEvhdFbTLb+wudJA59H6LKe7lCV2bNgoFLuR4W3JHA= +github.com/smartcontractkit/chainlink-testing-framework v1.18.7-0.20231114120758-934255522ff9/go.mod h1:zScXRqmvbyTFUooyLYrOp4+V/sFPUbFJNRc72YmnuIk= github.com/smartcontractkit/go-plugin v0.0.0-20231003134350-e49dad63b306 h1:ko88+ZznniNJZbZPWAvHQU8SwKAdHngdDZ+pvVgB5ss= github.com/smartcontractkit/go-plugin v0.0.0-20231003134350-e49dad63b306/go.mod h1:w1sAEES3g3PuV/RzUrgow20W2uErMly84hhD3um1WL4= github.com/smartcontractkit/grpc-proxy v0.0.0-20230731113816-f1be6620749f h1:hgJif132UCdjo8u43i7iPN1/MFnu49hv7lFGFftCHKU= From 66580b77a58287ea98ecc8f1997fc965601b5fb3 Mon Sep 17 00:00:00 2001 From: davidcauchi Date: Tue, 14 Nov 2023 14:30:14 +0100 Subject: [PATCH 2/4] Workaroud to build test image --- .github/actions/build-test-image/action.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/actions/build-test-image/action.yml b/.github/actions/build-test-image/action.yml index a241f51d920..419b82059af 100644 --- a/.github/actions/build-test-image/action.yml +++ b/.github/actions/build-test-image/action.yml @@ -36,7 +36,7 @@ runs: with: go-project-path: ./integration-tests module-name: github.com/smartcontractkit/chainlink-testing-framework - enforce-semantic-tag: "true" # it has to be in the form of v1.2.3 or the image won't exist + enforce-semantic-tag: "false" # it has to be in the form of v1.2.3 or the image won't exist - name: Check if image exists id: check-image uses: smartcontractkit/chainlink-github-actions/docker/image-exists@00c6214deb10a3f374c6d3430c32c5202015d463 # v2.2.12 From a9dd564cd7b4b77d40038fb4d31a8318bfc49de0 Mon Sep 17 00:00:00 2001 From: davidcauchi Date: Tue, 14 Nov 2023 14:51:33 +0100 Subject: [PATCH 3/4] push empty commit --- integration-tests/soak/ocr_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/integration-tests/soak/ocr_test.go b/integration-tests/soak/ocr_test.go index 9973c23808e..8f0f6f33d66 100644 --- a/integration-tests/soak/ocr_test.go +++ b/integration-tests/soak/ocr_test.go @@ -20,7 +20,7 @@ func TestOCRSoak(t *testing.T) { // fmt.Println("Using Chainlink TOML\n---------------------") // fmt.Println(client.AddNetworkDetailedConfig(config.BaseOCRP2PV1Config, customNetworkTOML, network)) // fmt.Println("---------------------") - + // ocrSoakTest, err := testsetups.NewOCRSoakTest(t, false) require.NoError(t, err, "Error creating soak test") if !ocrSoakTest.Interrupted() { From 0b545c727f44fee619583eaa7d8e28ccb86efb3b Mon Sep 17 00:00:00 2001 From: davidcauchi Date: Fri, 17 Nov 2023 11:13:37 +0100 Subject: [PATCH 4/4] add log --- integration-tests/go.mod | 1 + integration-tests/testsetups/ocr.go | 6 ++++++ 2 files changed, 7 insertions(+) diff --git a/integration-tests/go.mod b/integration-tests/go.mod index a1fab7d3133..15adea571b9 100644 --- a/integration-tests/go.mod +++ b/integration-tests/go.mod @@ -514,4 +514,5 @@ replace ( github.com/prometheus/prometheus => github.com/prometheus/prometheus v0.43.1-0.20230327151049-211ae4f1f0a2 github.com/sercand/kuberesolver v2.4.0+incompatible => github.com/sercand/kuberesolver/v5 v5.1.1 + github.com/smartcontractkit/chainlink-testing-framework => ../../chainlink-testing-framework ) diff --git a/integration-tests/testsetups/ocr.go b/integration-tests/testsetups/ocr.go index 3fb9dd9844a..643da50cec2 100644 --- a/integration-tests/testsetups/ocr.go +++ b/integration-tests/testsetups/ocr.go @@ -22,6 +22,7 @@ import ( "github.com/kelseyhightower/envconfig" "github.com/pelletier/go-toml/v2" "github.com/rs/zerolog" + "github.com/rs/zerolog/log" "github.com/stretchr/testify/require" "github.com/smartcontractkit/libocr/gethwrappers/offchainaggregator" @@ -277,6 +278,11 @@ func (o *OCRSoakTest) Run() { Int("Number of OCR Contracts", len(o.ocrInstances)). Msg("Starting OCR Soak Test") + log.Info(). + Str("Test Duration", o.Inputs.TestDuration.Truncate(time.Second).String()). + Int("Number of OCR Contracts", len(o.ocrInstances)). + Msg("Starting OCR Soak Test") + o.testLoop(o.Inputs.TestDuration, startingValue) o.complete() }