From d2121cef90a2f3aacb5676dc22c97d223b3014d6 Mon Sep 17 00:00:00 2001 From: Roman Zajic Date: Wed, 21 May 2025 17:44:13 +0800 Subject: [PATCH] fix: remove go-waku from workflows (#117) --- .github/workflows/interop_tests.yml | 4 ++-- .github/workflows/nim_go_waku_daily.yml | 19 ------------------- .github/workflows/test_PR_image.yml | 4 ++-- .github/workflows/test_common.yml | 4 ++-- src/env_vars.py | 3 +-- 5 files changed, 7 insertions(+), 27 deletions(-) delete mode 100644 .github/workflows/nim_go_waku_daily.yml diff --git a/.github/workflows/interop_tests.yml b/.github/workflows/interop_tests.yml index 68b10dbc..6a7bf64b 100644 --- a/.github/workflows/interop_tests.yml +++ b/.github/workflows/interop_tests.yml @@ -11,7 +11,7 @@ on: required: true description: "Node that usually publishes messages. Used for all tests" type: string - default: "wakuorg/go-waku:latest" + default: "wakuorg/nwaku:latest" node2: required: true description: "Node that usually queries for published messages. Used for all tests" @@ -21,7 +21,7 @@ on: required: false description: "Additional optional nodes used in e2e tests, separated by ," type: string - default: "wakuorg/nwaku:latest,wakuorg/go-waku:latest,wakuorg/nwaku:latest" + default: "wakuorg/nwaku:latest,wakuorg/nwaku:latest,wakuorg/nwaku:latest" jobs: test-common: diff --git a/.github/workflows/nim_go_waku_daily.yml b/.github/workflows/nim_go_waku_daily.yml deleted file mode 100644 index 5ad47db4..00000000 --- a/.github/workflows/nim_go_waku_daily.yml +++ /dev/null @@ -1,19 +0,0 @@ -name: Nim -> Go Waku Interop Tests - -concurrency: - group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }} - cancel-in-progress: false - -on: - schedule: - - cron: '0 3 * * *' - workflow_dispatch: - -jobs: - test-common: - uses: ./.github/workflows/test_common.yml - secrets: inherit - with: - node1: "wakuorg/nwaku:latest" - node2: "wakuorg/go-waku:latest" - caller: "go" diff --git a/.github/workflows/test_PR_image.yml b/.github/workflows/test_PR_image.yml index e2c643ff..d0401cf1 100644 --- a/.github/workflows/test_PR_image.yml +++ b/.github/workflows/test_PR_image.yml @@ -8,7 +8,7 @@ on: required: true type: string description: "Node that usually publishes messages. Used for all tests" - default: "wakuorg/go-waku:latest" + default: "wakuorg/nwaku:latest" node2: required: true description: "Node that usually queries for published messages. Used for all tests" @@ -18,7 +18,7 @@ on: required: false description: "Additional optional nodes used in e2e tests, separated by ," type: string - default: "wakuorg/nwaku:latest,wakuorg/go-waku:latest,wakuorg/nwaku:latest" + default: "wakuorg/nwaku:latest,wakuorg/nwaku:latest,wakuorg/nwaku:latest" caller: required: false description: "Workflow caller. Used in reporting" diff --git a/.github/workflows/test_common.yml b/.github/workflows/test_common.yml index 4a7a5295..87f094ed 100644 --- a/.github/workflows/test_common.yml +++ b/.github/workflows/test_common.yml @@ -7,7 +7,7 @@ on: required: true description: "Node that usually publishes messages. Used for all tests" type: string - default: "wakuorg/go-waku:latest" + default: "wakuorg/nwaku:latest" node2: required: true description: "Node that usually queries for published messages. Used for all tests" @@ -17,7 +17,7 @@ on: required: false description: "Additional optional nodes used in e2e tests, separated by ," type: string - default: "wakuorg/nwaku:latest,wakuorg/go-waku:latest,wakuorg/nwaku:latest" + default: "wakuorg/nwaku:latest,wakuorg/nwaku:latest,wakuorg/nwaku:latest" caller: required: false description: "Workflow caller. Used in reporting" diff --git a/src/env_vars.py b/src/env_vars.py index bdd008f0..1fc8f47a 100644 --- a/src/env_vars.py +++ b/src/env_vars.py @@ -15,11 +15,10 @@ def get_env_var(var_name, default=None): # Configuration constants. Need to be upercase to appear in reports DEFAULT_NWAKU = "wakuorg/nwaku:latest" -DEFAULT_GOWAKU = "wakuorg/go-waku:latest" STRESS_ENABLED = False NODE_1 = get_env_var("NODE_1", DEFAULT_NWAKU) NODE_2 = get_env_var("NODE_2", DEFAULT_NWAKU) -ADDITIONAL_NODES = get_env_var("ADDITIONAL_NODES", f"{DEFAULT_NWAKU},{DEFAULT_GOWAKU},{DEFAULT_NWAKU}") +ADDITIONAL_NODES = get_env_var("ADDITIONAL_NODES", f"{DEFAULT_NWAKU},{DEFAULT_NWAKU},{DEFAULT_NWAKU}") # more nodes need to follow the NODE_X pattern DOCKER_LOG_DIR = get_env_var("DOCKER_LOG_DIR", "./log/docker") NETWORK_NAME = get_env_var("NETWORK_NAME", "waku")