From 6e27322bbabc3a3b53a78bf89b518ded65611460 Mon Sep 17 00:00:00 2001 From: Bartek Tofel Date: Wed, 26 Jun 2024 11:53:43 +0200 Subject: [PATCH 1/3] remove merge artifact --- integration-tests/soak/ocr_test.go | 3 --- 1 file changed, 3 deletions(-) diff --git a/integration-tests/soak/ocr_test.go b/integration-tests/soak/ocr_test.go index 0e7b50d15b5..ab6051ee948 100644 --- a/integration-tests/soak/ocr_test.go +++ b/integration-tests/soak/ocr_test.go @@ -149,9 +149,6 @@ func executeOCRSoakTest(t *testing.T, test *testsetups.OCRSoakTest, config *tc.T require.NoError(t, err, "Error creating seth client") } - if !test.Interrupted() { - test.DeployEnvironment(config) - } l.Info().Str("test", t.Name()).Msg("Starting OCR soak test") if !test.Interrupted() { test.DeployEnvironment(config) From c6c0ad6c0a66323939ac97429d149aa0d86900a6 Mon Sep 17 00:00:00 2001 From: Bartek Tofel Date: Wed, 26 Jun 2024 14:39:29 +0200 Subject: [PATCH 2/3] embed more configs --- integration-tests/testconfig/configs_embed.go | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/integration-tests/testconfig/configs_embed.go b/integration-tests/testconfig/configs_embed.go index 67e954ff503..3a8670c42a0 100644 --- a/integration-tests/testconfig/configs_embed.go +++ b/integration-tests/testconfig/configs_embed.go @@ -7,12 +7,17 @@ import "embed" //go:embed default.toml //go:embed automation/automation.toml +//go:embed forwarder_ocr/forwarder_ocr.toml +//go:embed forwarder_ocr2/forwarder_ocr2.toml //go:embed functions/functions.toml //go:embed keeper/keeper.toml //go:embed log_poller/log_poller.toml //go:embed node/node.toml //go:embed ocr/ocr.toml +//go:embed ocr2/ocr2.toml +//go:embed vrf/vrf.toml //go:embed vrfv2/vrfv2.toml +//go:embed ocrvrfv2/ocrvrfv2.toml //go:embed vrfv2plus/vrfv2plus.toml var embeddedConfigsFs embed.FS From dd8b25594f5943786143766841d4a2ab859ba0a1 Mon Sep 17 00:00:00 2001 From: Bartek Tofel Date: Wed, 26 Jun 2024 15:02:18 +0200 Subject: [PATCH 3/3] fix embedded file name --- integration-tests/testconfig/configs_embed.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/integration-tests/testconfig/configs_embed.go b/integration-tests/testconfig/configs_embed.go index 3a8670c42a0..0dbd2b29e66 100644 --- a/integration-tests/testconfig/configs_embed.go +++ b/integration-tests/testconfig/configs_embed.go @@ -17,7 +17,7 @@ import "embed" //go:embed ocr2/ocr2.toml //go:embed vrf/vrf.toml //go:embed vrfv2/vrfv2.toml -//go:embed ocrvrfv2/ocrvrfv2.toml +//go:embed ocr2vrf/ocr2vrf.toml //go:embed vrfv2plus/vrfv2plus.toml var embeddedConfigsFs embed.FS