Skip to content

Commit 7490ce7

Browse files
bors[bot]Misha
andauthored
Merge #4177
4177: [BN2] Update BN2 creation, deletion CI workflows r=gomisha a=gomisha ## Context This PR tweaks and finalizes the changes to BN2 CI workflows for creating and deleting Benchnet 2 networks. This PR is made in conjunction with https://github.com/dapperlabs/flow-go/pull/6632 - removed old way of testing new network is accessible - removed `make k8s-expose-locally` - removed `make k8s-test-network-accessibility` - using new way now (`flow blocks get latest --host access1-<network_id>.benchnet.onflow.org:80`) ref: https://github.com/dapperlabs/flow-go/pull/6632 Co-authored-by: Misha <[email protected]>
2 parents bc11d79 + c7cc0c2 commit 7490ce7

File tree

1 file changed

+3
-10
lines changed

1 file changed

+3
-10
lines changed

integration/benchnet2/Makefile

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,12 @@ validate:
1515
ifeq ($(strip $(VALID_EXECUTION)), 1)
1616
# multiple execution nodes are required to prevent seals being generated in case of execution forking.
1717
$(error Number of Execution nodes should be no less than 2)
18-
else ifeq ($(strip $(NETWORK_ID)),)
19-
$(error NETWORK_ID cannot be empty)
2018
else ifeq ($(strip $(VALID_CONSENSUS)), 1)
2119
$(error Number of Consensus nodes should be no less than 2)
2220
else ifeq ($(strip $(VALID_COLLECTION)), 1)
2321
$(error Number of Collection nodes should be no less than 6)
22+
else ifeq ($(strip $(NETWORK_ID)),)
23+
$(error NETWORK_ID cannot be empty)
2424
else ifeq ($(strip $(NAMESPACE)),)
2525
$(error NAMESPACE cannot be empty)
2626
endif
@@ -55,7 +55,7 @@ deploy-all: validate gen-helm-values k8s-secrets-create helm-deploy
5555
clean-all: validate k8s-delete k8s-delete-secrets clean-bootstrap clean-gen-helm clean-flow
5656

5757
# target to be used in workflow as local clean up will not be needed
58-
remote-clean-all: validate k8s-delete-secrets k8s-delete
58+
remote-clean-all: validate k8s-delete-secrets k8s-delete
5959

6060
clean-bootstrap:
6161
rm -rf ./bootstrap
@@ -77,16 +77,9 @@ k8s-delete:
7777
k8s-delete-secrets:
7878
kubectl delete secrets -l networkId=${NETWORK_ID} --namespace ${NAMESPACE}
7979

80-
k8s-expose-locally: validate
81-
kubectl port-forward service/access1-${NETWORK_ID} 9000:9000 --namespace ${NAMESPACE}
82-
8380
k8s-pod-health: validate
8481
kubectl get pods --namespace ${NAMESPACE}
8582

86-
k8s-test-network-accessibility:
87-
flow blocks get latest --host localhost:9000
88-
flow accounts create --network benchnet --key e0ef5e52955e6542287db4528b3e8acc84a2c204eee9609f7c3120d1dac5a11b1bcb39677511db14354aa8c1a0ef62151220d97f015d49a8f0b78b653b570bfd --signer benchnet-account -f ~/flow.json
89-
9083
clone-flow: clean-flow
9184
# this cloned repo will be used for generating bootstrap info specific to that tag / version
9285
git clone https://github.com/onflow/flow-go.git

0 commit comments

Comments
 (0)