testing: Switch upgrade test to the testnet fixture

Author: maru-ava

.github/workflows/test.upgrade.yml

@@ -28,4 +28,12 @@ jobs:
         run: ./scripts/build.sh
       - name: Run upgrade tests
         shell: bash
-        run: scripts/tests.upgrade.sh 1.10.1 ./build/avalanchego
+        # 1.10.7 is the first version compatible with the testnet fixture by
+        # virtue of writing a process context file on node start.
+        run: ./scripts/tests.upgrade.sh 1.10.7
+      - name: Upload testnet network dir
+        uses: actions/upload-artifact@v3
+        if: always()
+        with:
+          name: testnet-data
+          path: ~/.testnetctl/networks/1000

go.mod

@@ -11,7 +11,6 @@ require (
 	github.com/DataDog/zstd v1.5.2
 	github.com/Microsoft/go-winio v0.5.2
 	github.com/NYTimes/gziphandler v1.1.1
-	github.com/ava-labs/avalanche-network-runner-sdk v0.3.0
 	github.com/ava-labs/coreth v0.12.5-rc.3
 	github.com/ava-labs/ledger-avalanche/go v0.0.0-20230105152938-00a24d05a8c7
 	github.com/btcsuite/btcd/btcutil v1.1.3

go.sum

@@ -61,8 +61,6 @@ github.com/allegro/bigcache v1.2.1-0.20190218064605-e24eb225f156 h1:eMwmnE/GDgah
 github.com/allegro/bigcache v1.2.1-0.20190218064605-e24eb225f156/go.mod h1:Cb/ax3seSYIx7SuZdm2G2xzfwmv3TPSk2ucNfQESPXM=
 github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY=
 github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod h1:grANhF5doyWs3UAsr3K4I6qtAmlQcZDesFNEHPZAzj8=
-github.com/ava-labs/avalanche-network-runner-sdk v0.3.0 h1:TVi9JEdKNU/RevYZ9PyW4pULbEdS+KQDA9Ki2DUvuAs=
-github.com/ava-labs/avalanche-network-runner-sdk v0.3.0/go.mod h1:SgKJvtqvgo/Bl/c8fxEHCLaSxEbzimYfBopcfrajxQk=
 github.com/ava-labs/coreth v0.12.5-rc.3 h1:cpmC+fSZMsO4gaFWqXHzAHrJACf05u5HPAYmwh7nmkU=
 github.com/ava-labs/coreth v0.12.5-rc.3/go.mod h1:HI+jTIflnDFBd0bledgkgid1Uurwr8q1h7zb3LsFsSo=
 github.com/ava-labs/ledger-avalanche/go v0.0.0-20230105152938-00a24d05a8c7 h1:EdxD90j5sClfL5Ngpz2TlnbnkNYdFPDXa0jDOjam65c=

scripts/install_anr.sh

@@ -3,8 +3,8 @@
 set -euo pipefail
 
 # e.g.,
-# ./scripts/build.sh
-# ./scripts/tests.upgrade.sh 1.7.16 ./build/avalanchego
+# ./scripts/tests.upgrade.sh 1.7.16
+# AVALANCHEGO_PATH=./path/to/avalanchego ./scripts/tests.upgrade.sh 1.7.16 # Customization of avalanchego path
 if ! [[ "$0" =~ scripts/tests.upgrade.sh ]]; then
   echo "must be run from repository root"
   exit 255
@@ -13,16 +13,16 @@ fi
 VERSION="${1:-}"
 if [[ -z "${VERSION}" ]]; then
   echo "Missing version argument!"
-  echo "Usage: ${0} [VERSION] [NEW-BINARY]" >>/dev/stderr
+  echo "Usage: ${0} [VERSION]" >>/dev/stderr
   exit 255
 fi
 
-NEW_BINARY="${2:-}"
-if [[ -z "${NEW_BINARY}" ]]; then
-  echo "Missing new binary path argument!"
-  echo "Usage: ${0} [VERSION] [NEW-BINARY]" >>/dev/stderr
+AVALANCHEGO_PATH="${AVALANCHEGO_PATH:-./build/avalanchego}"
+if [[ -z "${AVALANCHEGO_PATH}" ]]; then
+  echo "Empty AVALANCHEGO_PATH env var!"
   exit 255
 fi
+AVALANCHEGO_PATH="$(realpath ${AVALANCHEGO_PATH})"
 
 #################################
 # download avalanchego
@@ -52,11 +52,6 @@ elif [[ ${GOOS} == "darwin" ]]; then
 fi
 find /tmp/avalanchego-v${VERSION}
 
-#################################
-echo "installing avalanche-network-runner"
-ANR_WORKDIR="/tmp"
-./scripts/install_anr.sh
-
 # Sourcing constants.sh ensures that the necessary CGO flags are set to
 # build the portable version of BLST. Without this, ginkgo may fail to
 # build the test binary if run on a host (e.g. github worker) that lacks
@@ -70,35 +65,10 @@ go install -v github.com/onsi/ginkgo/v2/[email protected]
 ACK_GINKGO_RC=true ginkgo build ./tests/upgrade
 ./tests/upgrade/upgrade.test --help
 
-#################################
-# run "avalanche-network-runner" server
-echo "launch avalanche-network-runner in the background"
-$ANR_WORKDIR/avalanche-network-runner \
-  server \
-  --log-level debug \
-  --port=":12340" \
-  --disable-grpc-gateway &
-PID=${!}
-
 #################################
 # By default, it runs all upgrade test cases!
-echo "running upgrade tests against the local cluster with ${NEW_BINARY}"
+echo "running upgrade tests against the local cluster with ${AVALANCHEGO_PATH}"
 ./tests/upgrade/upgrade.test \
   --ginkgo.v \
-  --log-level debug \
-  --network-runner-grpc-endpoint="0.0.0.0:12340" \
-  --network-runner-avalanchego-path=/tmp/avalanchego-v${VERSION}/avalanchego \
-  --network-runner-avalanchego-path-to-upgrade=${NEW_BINARY} \
-  --network-runner-avalanchego-log-level="WARN" || EXIT_CODE=$?
-
-# "e2e.test" already terminates the cluster
-# just in case tests are aborted, manually terminate them again
-pkill -P ${PID} || true
-kill -2 ${PID}
-
-if [[ "${EXIT_CODE:-}" -gt 0 ]]; then
-  echo "FAILURE with exit code ${EXIT_CODE}"
-  exit ${EXIT_CODE}
-else
-  echo "ALL SUCCESS!"
-fi
+  --avalanchego-path=/tmp/avalanchego-v${VERSION}/avalanchego \
+  --avalanchego-path-to-upgrade-to=${AVALANCHEGO_PATH}

scripts/tests.upgrade.sh

@@ -237,9 +237,7 @@ func AddEphemeralNode(network testnet.Network, flags testnet.FlagsMap) testnet.N
 
 // Wait for the given node to report healthy.
 func WaitForHealthy(node testnet.Node) {
-	ctx, cancel := context.WithTimeout(context.Background(), DefaultTimeout)
-	defer cancel()
-	require.NoError(ginkgo.GinkgoT(), testnet.WaitForHealthy(ctx, node))
+	require.NoError(ginkgo.GinkgoT(), testnet.WaitForHealthy(DefaultContext(), node))
 }
 
 // Sends an eth transaction, waits for the transaction receipt to be issued

tests/e2e/e2e.go

@@ -677,20 +677,33 @@ func (ln *LocalNetwork) AddLocalNode(w io.Writer, node *LocalNode, isEphemeral b
 		return nil, err
 	}
 
-	// Collect staking addresses of running nodes for use in bootstraping the new node
-	if err := ln.ReadNodes(); err != nil {
-		return nil, fmt.Errorf("failed to read local network nodes: %w", err)
+	bootstrapIPs, bootstrapIDs, err := ln.GetBootstrapIPsAndIds()
+	if err != nil {
+		return nil, err
 	}
 
 	var (
 		// Use dynamic port allocation.
 		httpPort    uint16 = 0
 		stakingPort uint16 = 0
+	)
+	node.SetNetworkingConfigDefaults(httpPort, stakingPort, bootstrapIDs, bootstrapIPs)
+
+	if err := node.WriteConfig(); err != nil {
+		return nil, err
+	}
+	return node, node.Start(w, ln.ExecPath)
+}
 
+func (ln *LocalNetwork) GetBootstrapIPsAndIds() ([]string, []string, error) {
+	// Collect staking addresses of running nodes for use in bootstrapping a node
+	if err := ln.ReadNodes(); err != nil {
+		return nil, nil, fmt.Errorf("failed to read local network nodes: %w", err)
+	}
+	var (
 		bootstrapIPs = make([]string, 0, len(ln.Nodes))
 		bootstrapIDs = make([]string, 0, len(ln.Nodes))
 	)
-
 	for _, node := range ln.Nodes {
 		if len(node.StakingAddress) == 0 {
 			// Node is not running
@@ -700,14 +713,10 @@ func (ln *LocalNetwork) AddLocalNode(w io.Writer, node *LocalNode, isEphemeral b
 		bootstrapIPs = append(bootstrapIPs, node.StakingAddress)
 		bootstrapIDs = append(bootstrapIDs, node.NodeID.String())
 	}
+
 	if len(bootstrapIDs) == 0 {
-		return nil, errMissingBootstrapNodes
+		return nil, nil, errMissingBootstrapNodes
 	}
 
-	node.SetNetworkingConfigDefaults(httpPort, stakingPort, bootstrapIDs, bootstrapIPs)
-
-	if err := node.WriteConfig(); err != nil {
-		return nil, err
-	}
-	return node, node.Start(w, ln.ExecPath)
+	return bootstrapIPs, bootstrapIDs, nil
 }