From 01c41fab3a4952364c936974ead140a76346a1e1 Mon Sep 17 00:00:00 2001 From: Adrian Date: Thu, 19 Sep 2024 10:39:37 +0000 Subject: [PATCH] refactor: Remove validator-import container from testdata files --- .../run_tests/no_env/docker-compose.yml | 19 ------------------- .../run_tests/no_version/docker-compose.yml | 19 ------------------- .../run_tests/valid/docker-compose.yml | 19 ------------------- .../no_env/docker-compose.yml | 19 ------------------- .../no_version/docker-compose.yml | 19 ------------------- .../valid/docker-compose.yml | 19 ------------------- 6 files changed, 114 deletions(-) diff --git a/cli/testdata/run_tests/no_env/docker-compose.yml b/cli/testdata/run_tests/no_env/docker-compose.yml index 08a69421..3aff9abd 100644 --- a/cli/testdata/run_tests/no_env/docker-compose.yml +++ b/cli/testdata/run_tests/no_env/docker-compose.yml @@ -122,30 +122,11 @@ services: fi done " - validator-import: - container_name: validator-import-client - build: - context: github.com/NethermindEth/lighthouse-init-validator - args: - LH_VERSION: ${VL_IMAGE_VERSION} - NETWORK: ${NETWORK} - networks: - - sedge - volumes: - - ${KEYSTORE_DIR}:/keystore - - ${VL_DATA_DIR}:/data - logging: - driver: json-file - options: - max-size: 10m - max-file: "10" validator: container_name: validator-client image: ${VL_IMAGE_VERSION} restart: unless-stopped depends_on: - validator-import: - condition: service_completed_successfully validator-blocker: condition: service_completed_successfully consensus: diff --git a/cli/testdata/run_tests/no_version/docker-compose.yml b/cli/testdata/run_tests/no_version/docker-compose.yml index 01cd3491..dce93397 100644 --- a/cli/testdata/run_tests/no_version/docker-compose.yml +++ b/cli/testdata/run_tests/no_version/docker-compose.yml @@ -121,30 +121,11 @@ services: fi done " - validator-import: - container_name: validator-import-client - build: - context: github.com/NethermindEth/lighthouse-init-validator - args: - LH_VERSION: ${VL_IMAGE_VERSION} - NETWORK: ${NETWORK} - networks: - - sedge - volumes: - - ${KEYSTORE_DIR}:/keystore - - ${VL_DATA_DIR}:/data - logging: - driver: json-file - options: - max-size: 10m - max-file: "10" validator: container_name: validator-client image: ${VL_IMAGE_VERSION} restart: unless-stopped depends_on: - validator-import: - condition: service_completed_successfully validator-blocker: condition: service_completed_successfully consensus: diff --git a/cli/testdata/run_tests/valid/docker-compose.yml b/cli/testdata/run_tests/valid/docker-compose.yml index 01cd3491..dce93397 100644 --- a/cli/testdata/run_tests/valid/docker-compose.yml +++ b/cli/testdata/run_tests/valid/docker-compose.yml @@ -121,30 +121,11 @@ services: fi done " - validator-import: - container_name: validator-import-client - build: - context: github.com/NethermindEth/lighthouse-init-validator - args: - LH_VERSION: ${VL_IMAGE_VERSION} - NETWORK: ${NETWORK} - networks: - - sedge - volumes: - - ${KEYSTORE_DIR}:/keystore - - ${VL_DATA_DIR}:/data - logging: - driver: json-file - options: - max-size: 10m - max-file: "10" validator: container_name: validator-client image: ${VL_IMAGE_VERSION} restart: unless-stopped depends_on: - validator-import: - condition: service_completed_successfully validator-blocker: condition: service_completed_successfully consensus: diff --git a/internal/utils/testdata/validate_compose_tests/no_env/docker-compose.yml b/internal/utils/testdata/validate_compose_tests/no_env/docker-compose.yml index 08a69421..3aff9abd 100644 --- a/internal/utils/testdata/validate_compose_tests/no_env/docker-compose.yml +++ b/internal/utils/testdata/validate_compose_tests/no_env/docker-compose.yml @@ -122,30 +122,11 @@ services: fi done " - validator-import: - container_name: validator-import-client - build: - context: github.com/NethermindEth/lighthouse-init-validator - args: - LH_VERSION: ${VL_IMAGE_VERSION} - NETWORK: ${NETWORK} - networks: - - sedge - volumes: - - ${KEYSTORE_DIR}:/keystore - - ${VL_DATA_DIR}:/data - logging: - driver: json-file - options: - max-size: 10m - max-file: "10" validator: container_name: validator-client image: ${VL_IMAGE_VERSION} restart: unless-stopped depends_on: - validator-import: - condition: service_completed_successfully validator-blocker: condition: service_completed_successfully consensus: diff --git a/internal/utils/testdata/validate_compose_tests/no_version/docker-compose.yml b/internal/utils/testdata/validate_compose_tests/no_version/docker-compose.yml index 01cd3491..dce93397 100644 --- a/internal/utils/testdata/validate_compose_tests/no_version/docker-compose.yml +++ b/internal/utils/testdata/validate_compose_tests/no_version/docker-compose.yml @@ -121,30 +121,11 @@ services: fi done " - validator-import: - container_name: validator-import-client - build: - context: github.com/NethermindEth/lighthouse-init-validator - args: - LH_VERSION: ${VL_IMAGE_VERSION} - NETWORK: ${NETWORK} - networks: - - sedge - volumes: - - ${KEYSTORE_DIR}:/keystore - - ${VL_DATA_DIR}:/data - logging: - driver: json-file - options: - max-size: 10m - max-file: "10" validator: container_name: validator-client image: ${VL_IMAGE_VERSION} restart: unless-stopped depends_on: - validator-import: - condition: service_completed_successfully validator-blocker: condition: service_completed_successfully consensus: diff --git a/internal/utils/testdata/validate_compose_tests/valid/docker-compose.yml b/internal/utils/testdata/validate_compose_tests/valid/docker-compose.yml index 08a69421..3aff9abd 100644 --- a/internal/utils/testdata/validate_compose_tests/valid/docker-compose.yml +++ b/internal/utils/testdata/validate_compose_tests/valid/docker-compose.yml @@ -122,30 +122,11 @@ services: fi done " - validator-import: - container_name: validator-import-client - build: - context: github.com/NethermindEth/lighthouse-init-validator - args: - LH_VERSION: ${VL_IMAGE_VERSION} - NETWORK: ${NETWORK} - networks: - - sedge - volumes: - - ${KEYSTORE_DIR}:/keystore - - ${VL_DATA_DIR}:/data - logging: - driver: json-file - options: - max-size: 10m - max-file: "10" validator: container_name: validator-client image: ${VL_IMAGE_VERSION} restart: unless-stopped depends_on: - validator-import: - condition: service_completed_successfully validator-blocker: condition: service_completed_successfully consensus: