From 9249e413f5a72f58ff1082280375f74a75f3d45c Mon Sep 17 00:00:00 2001 From: Bartek Tofel Date: Thu, 27 Feb 2025 19:08:29 +0100 Subject: [PATCH] clean up keystone e2e configs (#16610) --- .../smoke/capabilities/environment-one-don.toml | 10 +++------- .../smoke/capabilities/environment-three-dons.toml | 14 +++----------- .../capabilities/environment-two-dons-ci.toml | 1 - .../smoke/capabilities/environment-two-dons.toml | 11 +++-------- 4 files changed, 9 insertions(+), 27 deletions(-) diff --git a/system-tests/tests/smoke/capabilities/environment-one-don.toml b/system-tests/tests/smoke/capabilities/environment-one-don.toml index 3475be9a958..821f025adbe 100644 --- a/system-tests/tests/smoke/capabilities/environment-one-don.toml +++ b/system-tests/tests/smoke/capabilities/environment-one-don.toml @@ -17,8 +17,9 @@ use_cre_cli = true should_compile_new_workflow = true - # workflow_folder_location = "path-to-folder-with-main.go-of-your-workflow" - workflow_folder_location = "/Users/bartektofel/Downloads/workflow_test" + # PoR test workflow is stored in smartcontractkit/proof-of-reserves-workflow-e2e-test repository + # config below assumes that you have it cloned next to chainlink repository + workflow_folder_location = "../../../../../proof-of-reserves-workflow-e2e-test" [workflow_config.dependencies] capabilities_version = "v1.0.2-alpha" @@ -44,7 +45,6 @@ [nodesets.node_specs.node] docker_ctx = "../../../.." docker_file = "plugins/chainlink.Dockerfile" - # image = "chainlink-tmp" user_config_overrides = """ [Feature] LogPoller = true @@ -63,7 +63,6 @@ [nodesets.node_specs.node] docker_ctx = "../../../.." docker_file = "plugins/chainlink.Dockerfile" - # image = "chainlink-tmp" capabilities = ["./amd64_cron"] user_config_overrides = """ [Feature] @@ -83,7 +82,6 @@ [nodesets.node_specs.node] docker_ctx = "../../../.." docker_file = "plugins/chainlink.Dockerfile" - # image = "chainlink-tmp" capabilities = ["./amd64_cron"] user_config_overrides = """ [Feature] @@ -103,7 +101,6 @@ [nodesets.node_specs.node] docker_ctx = "../../../.." docker_file = "plugins/chainlink.Dockerfile" - # image = "chainlink-tmp" capabilities = ["./amd64_cron"] user_config_overrides = """ [Feature] @@ -123,7 +120,6 @@ [nodesets.node_specs.node] docker_ctx = "../../../.." docker_file = "plugins/chainlink.Dockerfile" - # image = "chainlink-tmp" capabilities = ["./amd64_cron"] user_config_overrides = """ [Feature] diff --git a/system-tests/tests/smoke/capabilities/environment-three-dons.toml b/system-tests/tests/smoke/capabilities/environment-three-dons.toml index 33fd6c2f6aa..2176bdfa94a 100644 --- a/system-tests/tests/smoke/capabilities/environment-three-dons.toml +++ b/system-tests/tests/smoke/capabilities/environment-three-dons.toml @@ -13,8 +13,9 @@ use_cre_cli = true should_compile_new_workflow = true - # workflow_folder_location = "path-to-folder-with-main.go-of-your-workflow" - workflow_folder_location = "/Users/bartektofel/Downloads/workflow_test" + # PoR test workflow is stored in smartcontractkit/proof-of-reserves-workflow-e2e-test repository + # config below assumes that you have it cloned next to chainlink repository + workflow_folder_location = "../../../../../proof-of-reserves-workflow-e2e-test" [workflow_config.dependencies] capabilities_version = "v1.0.2-alpha" @@ -39,7 +40,6 @@ [nodesets.node_specs.node] docker_ctx = "../../../.." docker_file = "plugins/chainlink.Dockerfile" - # image = "chainlink-tmp" user_config_overrides = """ [Feature] LogPoller = true @@ -58,7 +58,6 @@ [nodesets.node_specs.node] docker_ctx = "../../../.." docker_file = "plugins/chainlink.Dockerfile" - # image = "chainlink-tmp" capabilities = ["./amd64_cron"] user_config_overrides = """ [Feature] @@ -78,7 +77,6 @@ [nodesets.node_specs.node] docker_ctx = "../../../.." docker_file = "plugins/chainlink.Dockerfile" - # image = "chainlink-tmp" capabilities = ["./amd64_cron"] user_config_overrides = """ [Feature] @@ -98,7 +96,6 @@ [nodesets.node_specs.node] docker_ctx = "../../../.." docker_file = "plugins/chainlink.Dockerfile" - # image = "chainlink-tmp" capabilities = ["./amd64_cron"] user_config_overrides = """ [Feature] @@ -118,7 +115,6 @@ [nodesets.node_specs.node] docker_ctx = "../../../.." docker_file = "plugins/chainlink.Dockerfile" - # image = "chainlink-tmp" capabilities = ["./amd64_cron"] user_config_overrides = """ [Feature] @@ -148,7 +144,6 @@ [nodesets.node_specs.node] docker_ctx = "../../../.." docker_file = "plugins/chainlink.Dockerfile" - # image = "chainlink-tmp" user_config_overrides = """ [Feature] LogPoller = true @@ -167,7 +162,6 @@ [nodesets.node_specs.node] docker_ctx = "../../../.." docker_file = "plugins/chainlink.Dockerfile" - # image = "chainlink-tmp" user_config_overrides = """ [Feature] LogPoller = true @@ -186,7 +180,6 @@ [nodesets.node_specs.node] docker_ctx = "../../../.." docker_file = "plugins/chainlink.Dockerfile" - # image = "chainlink-tmp" user_config_overrides = """ [Feature] LogPoller = true @@ -215,7 +208,6 @@ [nodesets.node_specs.node] docker_ctx = "../../../.." docker_file = "plugins/chainlink.Dockerfile" - # image = "chainlink-tmp" user_config_overrides = """ [Feature] LogPoller = true diff --git a/system-tests/tests/smoke/capabilities/environment-two-dons-ci.toml b/system-tests/tests/smoke/capabilities/environment-two-dons-ci.toml index c85cb2a53ad..444df65e33f 100644 --- a/system-tests/tests/smoke/capabilities/environment-two-dons-ci.toml +++ b/system-tests/tests/smoke/capabilities/environment-two-dons-ci.toml @@ -15,7 +15,6 @@ use_cre_cli = true should_compile_new_workflow = false - workflow_folder_location = "not-needed-here" [workflow_config.dependencies] capabilities_version = "v1.0.2-alpha" diff --git a/system-tests/tests/smoke/capabilities/environment-two-dons.toml b/system-tests/tests/smoke/capabilities/environment-two-dons.toml index a2173ea38c5..77e1282961e 100644 --- a/system-tests/tests/smoke/capabilities/environment-two-dons.toml +++ b/system-tests/tests/smoke/capabilities/environment-two-dons.toml @@ -17,8 +17,9 @@ use_cre_cli = true should_compile_new_workflow = true - # workflow_folder_location = "path-to-folder-with-main.go-of-your-workflow" - workflow_folder_location = "/Users/bartektofel/Downloads/workflow_test" + # PoR test workflow is stored in smartcontractkit/proof-of-reserves-workflow-e2e-test repository + # config below assumes that you have it cloned next to chainlink repository + workflow_folder_location = "../../../../../proof-of-reserves-workflow-e2e-test" [workflow_config.dependencies] capabilities_version = "v1.0.2-alpha" @@ -44,7 +45,6 @@ [nodesets.node_specs.node] docker_ctx = "../../../.." docker_file = "plugins/chainlink.Dockerfile" - # image = "chainlink-tmp" user_config_overrides = """ [Feature] LogPoller = true @@ -63,7 +63,6 @@ [nodesets.node_specs.node] docker_ctx = "../../../.." docker_file = "plugins/chainlink.Dockerfile" - # image = "chainlink-tmp" capabilities = ["./amd64_cron"] user_config_overrides = """ [Feature] @@ -83,7 +82,6 @@ [nodesets.node_specs.node] docker_ctx = "../../../.." docker_file = "plugins/chainlink.Dockerfile" - # image = "chainlink-tmp" capabilities = ["./amd64_cron"] user_config_overrides = """ [Feature] @@ -103,7 +101,6 @@ [nodesets.node_specs.node] docker_ctx = "../../../.." docker_file = "plugins/chainlink.Dockerfile" - # image = "chainlink-tmp" capabilities = ["./amd64_cron"] user_config_overrides = """ [Feature] @@ -123,7 +120,6 @@ [nodesets.node_specs.node] docker_ctx = "../../../.." docker_file = "plugins/chainlink.Dockerfile" - # image = "chainlink-tmp" capabilities = ["./amd64_cron"] user_config_overrides = """ [Feature] @@ -153,7 +149,6 @@ [nodesets.node_specs.node] docker_ctx = "../../../.." docker_file = "plugins/chainlink.Dockerfile" - # image = "chainlink-tmp" user_config_overrides = """ [Feature] LogPoller = true