From 4e964521193c19c4339f976aeb58f4d15c75464a Mon Sep 17 00:00:00 2001 From: fbarbu15 Date: Mon, 29 Jul 2024 15:51:04 +0300 Subject: [PATCH] use docker hub (#63) --- .github/workflows/interop_tests.yml | 6 +++--- .github/workflows/nim_go_waku_daily.yml | 4 ++-- .github/workflows/nim_waku_daily.yml | 6 +++--- .github/workflows/test_common.yml | 6 +++--- .../gowaku_bug_1034_gowaku_fails_to_fetch_messages.sh | 4 ++-- ...u_bug_1078_light_push_fails_without_subscription.sh | 4 ++-- ...ku_bug_2512_lightnodes_not_receiving_filter_push.sh | 10 +++++----- .../nwaku_bug_2567_light_push_fails_after_restart.sh | 4 ++-- scripts/store_v3.sh | 4 ++-- src/env_vars.py | 4 ++-- 10 files changed, 26 insertions(+), 26 deletions(-) diff --git a/.github/workflows/interop_tests.yml b/.github/workflows/interop_tests.yml index 86368171..68b10dbc 100644 --- a/.github/workflows/interop_tests.yml +++ b/.github/workflows/interop_tests.yml @@ -11,17 +11,17 @@ on: required: true description: "Node that usually publishes messages. Used for all tests" type: string - default: "harbor.status.im/wakuorg/go-waku:latest" + default: "wakuorg/go-waku:latest" node2: required: true description: "Node that usually queries for published messages. Used for all tests" type: string - default: "harbor.status.im/wakuorg/nwaku:latest" + default: "wakuorg/nwaku:latest" additional_nodes: required: false description: "Additional optional nodes used in e2e tests, separated by ," type: string - default: "harbor.status.im/wakuorg/nwaku:latest,harbor.status.im/wakuorg/go-waku:latest,harbor.status.im/wakuorg/nwaku:latest" + default: "wakuorg/nwaku:latest,wakuorg/go-waku: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 index 1bc53071..5ad47db4 100644 --- a/.github/workflows/nim_go_waku_daily.yml +++ b/.github/workflows/nim_go_waku_daily.yml @@ -14,6 +14,6 @@ jobs: uses: ./.github/workflows/test_common.yml secrets: inherit with: - node1: "harbor.status.im/wakuorg/nwaku:latest" - node2: "harbor.status.im/wakuorg/go-waku:latest" + node1: "wakuorg/nwaku:latest" + node2: "wakuorg/go-waku:latest" caller: "go" diff --git a/.github/workflows/nim_waku_daily.yml b/.github/workflows/nim_waku_daily.yml index 1d83de13..0154d9fc 100644 --- a/.github/workflows/nim_waku_daily.yml +++ b/.github/workflows/nim_waku_daily.yml @@ -14,7 +14,7 @@ jobs: uses: ./.github/workflows/test_common.yml secrets: inherit with: - node1: "harbor.status.im/wakuorg/nwaku:latest" - node2: "harbor.status.im/wakuorg/nwaku:latest" - additional_nodes: "harbor.status.im/wakuorg/nwaku:latest,harbor.status.im/wakuorg/nwaku:latest,harbor.status.im/wakuorg/nwaku:latest" + node1: "wakuorg/nwaku:latest" + node2: "wakuorg/nwaku:latest" + additional_nodes: "wakuorg/nwaku:latest,wakuorg/nwaku:latest,wakuorg/nwaku:latest" caller: "nim" diff --git a/.github/workflows/test_common.yml b/.github/workflows/test_common.yml index 21e5a757..6b985163 100644 --- a/.github/workflows/test_common.yml +++ b/.github/workflows/test_common.yml @@ -7,17 +7,17 @@ on: required: true description: "Node that usually publishes messages. Used for all tests" type: string - default: "harbor.status.im/wakuorg/go-waku:latest" + default: "wakuorg/go-waku:latest" node2: required: true description: "Node that usually queries for published messages. Used for all tests" type: string - default: "harbor.status.im/wakuorg/nwaku:latest" + default: "wakuorg/nwaku:latest" additional_nodes: required: false description: "Additional optional nodes used in e2e tests, separated by ," type: string - default: "harbor.status.im/wakuorg/nwaku:latest,harbor.status.im/wakuorg/go-waku:latest,harbor.status.im/wakuorg/nwaku:latest" + default: "wakuorg/nwaku:latest,wakuorg/go-waku:latest,wakuorg/nwaku:latest" caller: required: false description: "Workflow caller. Used in reporting" diff --git a/scripts/gowaku_bug_1034_gowaku_fails_to_fetch_messages.sh b/scripts/gowaku_bug_1034_gowaku_fails_to_fetch_messages.sh index 24cf23fa..f5ab0d89 100755 --- a/scripts/gowaku_bug_1034_gowaku_fails_to_fetch_messages.sh +++ b/scripts/gowaku_bug_1034_gowaku_fails_to_fetch_messages.sh @@ -6,8 +6,8 @@ printf "\nAssuming you already have a docker network called waku\n" cluster_id=4 pubsub_topic="/waku/2/rs/$cluster_id/0" encoded_pubsub_topic=$(echo "$pubsub_topic" | sed 's:/:%2F:g') -node_1=harbor.status.im/wakuorg/nwaku:latest -node_2=harbor.status.im/wakuorg/go-waku:latest +node_1=wakuorg/nwaku:latest +node_2=wakuorg/go-waku:latest printf "\nStarting containers\n" diff --git a/scripts/gowaku_bug_1078_light_push_fails_without_subscription.sh b/scripts/gowaku_bug_1078_light_push_fails_without_subscription.sh index 6917b1e9..5a692d52 100755 --- a/scripts/gowaku_bug_1078_light_push_fails_without_subscription.sh +++ b/scripts/gowaku_bug_1078_light_push_fails_without_subscription.sh @@ -5,8 +5,8 @@ printf "\nAssuming you already have a docker network called waku\n" cluster_id=2 pubsub_topic="/waku/2/rs/$cluster_id/0" -node_1=harbor.status.im/wakuorg/nwaku:latest -node_2=harbor.status.im/wakuorg/go-waku:latest +node_1=wakuorg/nwaku:latest +node_2=wakuorg/go-waku:latest ext_ip="172.18.204.9" tcp_port="37344" diff --git a/scripts/nwaku_bug_2512_lightnodes_not_receiving_filter_push.sh b/scripts/nwaku_bug_2512_lightnodes_not_receiving_filter_push.sh index 23747885..85c79109 100755 --- a/scripts/nwaku_bug_2512_lightnodes_not_receiving_filter_push.sh +++ b/scripts/nwaku_bug_2512_lightnodes_not_receiving_filter_push.sh @@ -4,19 +4,19 @@ echo "Assuming you already have a docker network called waku" echo "Starting containers" -container_id1=$(docker run -d -i -t -p 41717:41717 -p 41718:41718 -p 41719:41719 -p 41720:41720 -p 41721:41721 harbor.status.im/wakuorg/nwaku:latest --listen-address=0.0.0.0 --rest=true --rest-admin=true --websocket-support=true --log-level=TRACE --rest-relay-cache-capacity=100 --websocket-port=41719 --rest-port=41717 --tcp-port=41718 --discv5-udp-port=41720 --rest-address=0.0.0.0 --nat=extip:172.18.223.170 --peer-exchange=true --discv5-discovery=true --cluster-id=0 --metrics-server=true --metrics-server-address=0.0.0.0 --metrics-server-port=41721 --metrics-logging=true --relay=true --filter=true --nodekey=30348dd51465150e04a5d9d932c72864c8967f806cce60b5d26afeca1e77eb68) +container_id1=$(docker run -d -i -t -p 41717:41717 -p 41718:41718 -p 41719:41719 -p 41720:41720 -p 41721:41721 wakuorg/nwaku:latest --listen-address=0.0.0.0 --rest=true --rest-admin=true --websocket-support=true --log-level=TRACE --rest-relay-cache-capacity=100 --websocket-port=41719 --rest-port=41717 --tcp-port=41718 --discv5-udp-port=41720 --rest-address=0.0.0.0 --nat=extip:172.18.223.170 --peer-exchange=true --discv5-discovery=true --cluster-id=0 --metrics-server=true --metrics-server-address=0.0.0.0 --metrics-server-port=41721 --metrics-logging=true --relay=true --filter=true --nodekey=30348dd51465150e04a5d9d932c72864c8967f806cce60b5d26afeca1e77eb68) docker network connect --ip 172.18.223.170 waku $container_id1 -container_id2=$(docker run -d -i -t -p 10628:10628 -p 10629:10629 -p 10630:10630 -p 10631:10631 -p 10632:10632 harbor.status.im/wakuorg/nwaku:latest --listen-address=0.0.0.0 --rest=true --rest-admin=true --websocket-support=true --log-level=TRACE --rest-relay-cache-capacity=100 --websocket-port=10630 --rest-port=10628 --tcp-port=10629 --discv5-udp-port=10631 --rest-address=0.0.0.0 --nat=extip:172.18.249.98 --peer-exchange=true --discv5-discovery=true --cluster-id=0 --metrics-server=true --metrics-server-address=0.0.0.0 --metrics-server-port=10632 --metrics-logging=true --relay=false --filter=true --discv5-bootstrap-node=enr:-Kq4QEXWJfpPEPrBCJlgXGla9FJiEzYKM6P8DuVyQbGyl_-POLWKvQgMQEZDF3tDPTIdUKqCI8i2GG0MW2FsOkAtoW0BgmlkgnY0gmlwhKwS36qKbXVsdGlhZGRyc4wACgSsEt-qBqL33QOJc2VjcDI1NmsxoQM3Tqpf5eFn4Jztm4gB0Y0JVSJyxyZsW8QR-QU5DZb-PYN0Y3CCovaDdWRwgqL4hXdha3UyBQ --filternode=/ip4/172.18.223.170/tcp/41718/p2p/16Uiu2HAmGNtM2rQ8abySFNhqPDFY4cmfAEpfo9Z9fD3NekoFR2ip) +container_id2=$(docker run -d -i -t -p 10628:10628 -p 10629:10629 -p 10630:10630 -p 10631:10631 -p 10632:10632 wakuorg/nwaku:latest --listen-address=0.0.0.0 --rest=true --rest-admin=true --websocket-support=true --log-level=TRACE --rest-relay-cache-capacity=100 --websocket-port=10630 --rest-port=10628 --tcp-port=10629 --discv5-udp-port=10631 --rest-address=0.0.0.0 --nat=extip:172.18.249.98 --peer-exchange=true --discv5-discovery=true --cluster-id=0 --metrics-server=true --metrics-server-address=0.0.0.0 --metrics-server-port=10632 --metrics-logging=true --relay=false --filter=true --discv5-bootstrap-node=enr:-Kq4QEXWJfpPEPrBCJlgXGla9FJiEzYKM6P8DuVyQbGyl_-POLWKvQgMQEZDF3tDPTIdUKqCI8i2GG0MW2FsOkAtoW0BgmlkgnY0gmlwhKwS36qKbXVsdGlhZGRyc4wACgSsEt-qBqL33QOJc2VjcDI1NmsxoQM3Tqpf5eFn4Jztm4gB0Y0JVSJyxyZsW8QR-QU5DZb-PYN0Y3CCovaDdWRwgqL4hXdha3UyBQ --filternode=/ip4/172.18.223.170/tcp/41718/p2p/16Uiu2HAmGNtM2rQ8abySFNhqPDFY4cmfAEpfo9Z9fD3NekoFR2ip) docker network connect --ip 172.18.249.98 waku $container_id2 -container_id3=$(docker run -d -i -t -p 12108:12108 -p 12109:12109 -p 12110:12110 -p 12111:12111 -p 12112:12112 harbor.status.im/wakuorg/go-waku:latest --listen-address=0.0.0.0 --rest=true --rest-admin=true --websocket-support=true --log-level=DEBUG --rest-relay-cache-capacity=100 --websocket-port=12110 --rest-port=12108 --tcp-port=12109 --discv5-udp-port=12111 --rest-address=0.0.0.0 --nat=extip:172.18.102.113 --peer-exchange=true --discv5-discovery=true --cluster-id=0 --min-relay-peers-to-publish=1 --rest-filter-cache-capacity=50 --relay=false --filter=true --discv5-bootstrap-node=enr:-Kq4QEXWJfpPEPrBCJlgXGla9FJiEzYKM6P8DuVyQbGyl_-POLWKvQgMQEZDF3tDPTIdUKqCI8i2GG0MW2FsOkAtoW0BgmlkgnY0gmlwhKwS36qKbXVsdGlhZGRyc4wACgSsEt-qBqL33QOJc2VjcDI1NmsxoQM3Tqpf5eFn4Jztm4gB0Y0JVSJyxyZsW8QR-QU5DZb-PYN0Y3CCovaDdWRwgqL4hXdha3UyBQ --filternode=/ip4/172.18.223.170/tcp/41718/p2p/16Uiu2HAmGNtM2rQ8abySFNhqPDFY4cmfAEpfo9Z9fD3NekoFR2ip) +container_id3=$(docker run -d -i -t -p 12108:12108 -p 12109:12109 -p 12110:12110 -p 12111:12111 -p 12112:12112 wakuorg/go-waku:latest --listen-address=0.0.0.0 --rest=true --rest-admin=true --websocket-support=true --log-level=DEBUG --rest-relay-cache-capacity=100 --websocket-port=12110 --rest-port=12108 --tcp-port=12109 --discv5-udp-port=12111 --rest-address=0.0.0.0 --nat=extip:172.18.102.113 --peer-exchange=true --discv5-discovery=true --cluster-id=0 --min-relay-peers-to-publish=1 --rest-filter-cache-capacity=50 --relay=false --filter=true --discv5-bootstrap-node=enr:-Kq4QEXWJfpPEPrBCJlgXGla9FJiEzYKM6P8DuVyQbGyl_-POLWKvQgMQEZDF3tDPTIdUKqCI8i2GG0MW2FsOkAtoW0BgmlkgnY0gmlwhKwS36qKbXVsdGlhZGRyc4wACgSsEt-qBqL33QOJc2VjcDI1NmsxoQM3Tqpf5eFn4Jztm4gB0Y0JVSJyxyZsW8QR-QU5DZb-PYN0Y3CCovaDdWRwgqL4hXdha3UyBQ --filternode=/ip4/172.18.223.170/tcp/41718/p2p/16Uiu2HAmGNtM2rQ8abySFNhqPDFY4cmfAEpfo9Z9fD3NekoFR2ip) docker network connect --ip 172.18.102.113 waku $container_id3 -container_id4=$(docker run -d -i -t -p 6707:6707 -p 6708:6708 -p 6709:6709 -p 6710:6710 -p 6711:6711 harbor.status.im/wakuorg/go-waku:latest --listen-address=0.0.0.0 --rest=true --rest-admin=true --websocket-support=true --log-level=DEBUG --rest-relay-cache-capacity=100 --websocket-port=6709 --rest-port=6707 --tcp-port=6708 --discv5-udp-port=6710 --rest-address=0.0.0.0 --nat=extip:172.18.156.205 --peer-exchange=true --discv5-discovery=true --cluster-id=0 --min-relay-peers-to-publish=1 --rest-filter-cache-capacity=50 --relay=false --filter=true --discv5-bootstrap-node=enr:-Kq4QEXWJfpPEPrBCJlgXGla9FJiEzYKM6P8DuVyQbGyl_-POLWKvQgMQEZDF3tDPTIdUKqCI8i2GG0MW2FsOkAtoW0BgmlkgnY0gmlwhKwS36qKbXVsdGlhZGRyc4wACgSsEt-qBqL33QOJc2VjcDI1NmsxoQM3Tqpf5eFn4Jztm4gB0Y0JVSJyxyZsW8QR-QU5DZb-PYN0Y3CCovaDdWRwgqL4hXdha3UyBQ --filternode=/ip4/172.18.223.170/tcp/41718/p2p/16Uiu2HAmGNtM2rQ8abySFNhqPDFY4cmfAEpfo9Z9fD3NekoFR2ip) +container_id4=$(docker run -d -i -t -p 6707:6707 -p 6708:6708 -p 6709:6709 -p 6710:6710 -p 6711:6711 wakuorg/go-waku:latest --listen-address=0.0.0.0 --rest=true --rest-admin=true --websocket-support=true --log-level=DEBUG --rest-relay-cache-capacity=100 --websocket-port=6709 --rest-port=6707 --tcp-port=6708 --discv5-udp-port=6710 --rest-address=0.0.0.0 --nat=extip:172.18.156.205 --peer-exchange=true --discv5-discovery=true --cluster-id=0 --min-relay-peers-to-publish=1 --rest-filter-cache-capacity=50 --relay=false --filter=true --discv5-bootstrap-node=enr:-Kq4QEXWJfpPEPrBCJlgXGla9FJiEzYKM6P8DuVyQbGyl_-POLWKvQgMQEZDF3tDPTIdUKqCI8i2GG0MW2FsOkAtoW0BgmlkgnY0gmlwhKwS36qKbXVsdGlhZGRyc4wACgSsEt-qBqL33QOJc2VjcDI1NmsxoQM3Tqpf5eFn4Jztm4gB0Y0JVSJyxyZsW8QR-QU5DZb-PYN0Y3CCovaDdWRwgqL4hXdha3UyBQ --filternode=/ip4/172.18.223.170/tcp/41718/p2p/16Uiu2HAmGNtM2rQ8abySFNhqPDFY4cmfAEpfo9Z9fD3NekoFR2ip) docker network connect --ip 172.18.156.205 waku $container_id4 -container_id5=$(docker run -d -i -t -p 30889:30889 -p 30890:30890 -p 30891:30891 -p 30892:30892 -p 30893:30893 harbor.status.im/wakuorg/go-waku:latest --listen-address=0.0.0.0 --rest=true --rest-admin=true --websocket-support=true --log-level=DEBUG --rest-relay-cache-capacity=100 --websocket-port=30891 --rest-port=30889 --tcp-port=30890 --discv5-udp-port=30892 --rest-address=0.0.0.0 --nat=extip:172.18.161.78 --peer-exchange=true --discv5-discovery=true --cluster-id=0 --min-relay-peers-to-publish=1 --rest-filter-cache-capacity=50 --relay=false --filter=true --discv5-bootstrap-node=enr:-Kq4QEXWJfpPEPrBCJlgXGla9FJiEzYKM6P8DuVyQbGyl_-POLWKvQgMQEZDF3tDPTIdUKqCI8i2GG0MW2FsOkAtoW0BgmlkgnY0gmlwhKwS36qKbXVsdGlhZGRyc4wACgSsEt-qBqL33QOJc2VjcDI1NmsxoQM3Tqpf5eFn4Jztm4gB0Y0JVSJyxyZsW8QR-QU5DZb-PYN0Y3CCovaDdWRwgqL4hXdha3UyBQ --filternode=/ip4/172.18.223.170/tcp/41718/p2p/16Uiu2HAmGNtM2rQ8abySFNhqPDFY4cmfAEpfo9Z9fD3NekoFR2ip) +container_id5=$(docker run -d -i -t -p 30889:30889 -p 30890:30890 -p 30891:30891 -p 30892:30892 -p 30893:30893 wakuorg/go-waku:latest --listen-address=0.0.0.0 --rest=true --rest-admin=true --websocket-support=true --log-level=DEBUG --rest-relay-cache-capacity=100 --websocket-port=30891 --rest-port=30889 --tcp-port=30890 --discv5-udp-port=30892 --rest-address=0.0.0.0 --nat=extip:172.18.161.78 --peer-exchange=true --discv5-discovery=true --cluster-id=0 --min-relay-peers-to-publish=1 --rest-filter-cache-capacity=50 --relay=false --filter=true --discv5-bootstrap-node=enr:-Kq4QEXWJfpPEPrBCJlgXGla9FJiEzYKM6P8DuVyQbGyl_-POLWKvQgMQEZDF3tDPTIdUKqCI8i2GG0MW2FsOkAtoW0BgmlkgnY0gmlwhKwS36qKbXVsdGlhZGRyc4wACgSsEt-qBqL33QOJc2VjcDI1NmsxoQM3Tqpf5eFn4Jztm4gB0Y0JVSJyxyZsW8QR-QU5DZb-PYN0Y3CCovaDdWRwgqL4hXdha3UyBQ --filternode=/ip4/172.18.223.170/tcp/41718/p2p/16Uiu2HAmGNtM2rQ8abySFNhqPDFY4cmfAEpfo9Z9fD3NekoFR2ip) docker network connect --ip 172.18.161.78 waku $container_id5 echo "Sleeping 20 seconds" diff --git a/scripts/nwaku_bug_2567_light_push_fails_after_restart.sh b/scripts/nwaku_bug_2567_light_push_fails_after_restart.sh index e1813cbf..75180bcd 100755 --- a/scripts/nwaku_bug_2567_light_push_fails_after_restart.sh +++ b/scripts/nwaku_bug_2567_light_push_fails_after_restart.sh @@ -5,8 +5,8 @@ printf "\nAssuming you already have a docker network called waku\n" cluster_id=2 pubsub_topic="/waku/2/rs/$cluster_id/0" -node_1=harbor.status.im/wakuorg/nwaku:latest -node_2=harbor.status.im/wakuorg/nwaku:latest +node_1=wakuorg/nwaku:latest +node_2=wakuorg/nwaku:latest ext_ip="172.18.204.9" tcp_port="37344" diff --git a/scripts/store_v3.sh b/scripts/store_v3.sh index cff65acf..2a79b038 100755 --- a/scripts/store_v3.sh +++ b/scripts/store_v3.sh @@ -8,11 +8,11 @@ pubsub_topic="/waku/2/rs/$cluster_id/0" encoded_pubsub_topic=$(echo "$pubsub_topic" | sed 's:/:%2F:g') content_topic="/test/1/store/proto" encoded_content_topic=$(echo "$content_topic" | sed 's:/:%2F:g') -node_1=harbor.status.im/wakuorg/nwaku:latest +node_1=wakuorg/nwaku:latest node_1_ip=172.18.64.13 node_1_rest=32261 node_1_tcp=32262 -node_2=harbor.status.im/wakuorg/nwaku:latest +node_2=wakuorg/nwaku:latest node_2_ip=172.18.64.14 node_2_rest=4588 diff --git a/src/env_vars.py b/src/env_vars.py index 9217af52..f58aeeb2 100644 --- a/src/env_vars.py +++ b/src/env_vars.py @@ -14,8 +14,8 @@ def get_env_var(var_name, default=None): # Configuration constants. Need to be upercase to appear in reports -DEFAULT_NWAKU = "harbor.status.im/wakuorg/nwaku:latest" -DEFAULT_GOWAKU = "harbor.status.im/wakuorg/go-waku:latest" +DEFAULT_NWAKU = "wakuorg/nwaku:latest" +DEFAULT_GOWAKU = "wakuorg/go-waku:latest" NODE_1 = get_env_var("NODE_1", DEFAULT_GOWAKU) NODE_2 = get_env_var("NODE_2", DEFAULT_NWAKU) ADDITIONAL_NODES = get_env_var("ADDITIONAL_NODES", f"{DEFAULT_NWAKU},{DEFAULT_GOWAKU},{DEFAULT_NWAKU}")