Make SNAP_CHANNEL more visible in build log

Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "solana"
 description = "Blockchain, Rebuilt for Scale"
-version = "0.7.1"
+version = "0.7.2"
 documentation = "https://docs.rs/solana"
 homepage = "http://solana.com/"
 readme = "README.md"

ci/snap.sh

@@ -11,7 +11,9 @@ fi
 # when this script is run from a triggered pipeline, TRIGGERED_BUILDKITE_TAG is
 # used instead of BUILDKITE_TAG (due to Buildkite limitations that prevents
 # BUILDKITE_TAG from propagating through to triggered pipelines)
-if [[ -z "$BUILDKITE_TAG" && -z "$TRIGGERED_BUILDKITE_TAG" ]]; then
+if [[ -n "$BUILDKITE_TAG" || -n "$TRIGGERED_BUILDKITE_TAG" ]]; then
+  SNAP_CHANNEL=stable
+elif [[ $BUILDKITE_BRANCH = master ]]; then
   SNAP_CHANNEL=edge
 else
   SNAP_CHANNEL=beta
@@ -43,11 +45,11 @@ if [[ ! -x /usr/bin/multilog ]]; then
   exit 1
 fi
 
-echo --- build
+echo --- build: $SNAP_CHANNEL channel
 snapcraft
 
 source ci/upload_ci_artifact.sh
 upload_ci_artifact solana_*.snap
 
-echo --- publish
+echo --- publish: $SNAP_CHANNEL channel
 $DRYRUN snapcraft push solana_*.snap --release $SNAP_CHANNEL

ci/testnet-deploy.sh

@@ -70,7 +70,10 @@ fi
 SNAP_INSTALL_CMD="sudo snap remove solana; $SNAP_INSTALL_CMD"
 
 EARLYOOM_INSTALL_CMD="\
-  wget -O install-earlyoom.sh https://raw.githubusercontent.com/solana-labs/solana/master/ci/install-earlyoom.sh; \
+  wget --retry-connrefused --waitretry=1 \
+    --read-timeout=20 --timeout=15 --tries=5 \
+    -O install-earlyoom.sh \
+    https://raw.githubusercontent.com/solana-labs/solana/master/ci/install-earlyoom.sh; \
   bash install-earlyoom.sh \
 "
 SNAP_INSTALL_CMD="$EARLYOOM_INSTALL_CMD; $SNAP_INSTALL_CMD"

ci/testnet-sanity.sh

@@ -17,12 +17,17 @@ if [[ -z $EXPECTED_NODE_COUNT ]]; then
 fi
 
 echo "--- $NET_URL: verify ledger"
-if [[ -d /var/snap/solana/current/config/ledger ]]; then
+if [[ -z $NO_LEDGER_VERIFY ]]; then
-  # Note: here we assume this script is actually running on the leader node...
+  if [[ -d /var/snap/solana/current/config/ledger ]]; then
-  sudo solana.ledger-tool --ledger /var/snap/solana/current/config/ledger verify
+    # Note: here we assume this script is actually running on the leader node...
+    sudo solana.ledger-tool --ledger /var/snap/solana/current/config/ledger verify
+  else
+    echo "^^^ +++"
+    echo "Ledger verify skipped"
+  fi
 else
   echo "^^^ +++"
-  echo "Ledger verify skipped"
+  echo "Ledger verify skipped (NO_LEDGER_VERIFY defined)"
 fi
 
 echo "--- $NET_URL: wallet sanity"
@@ -54,13 +59,15 @@ if [[ -z $NO_VALIDATOR_SANITY ]]; then
   )
   wc -l validator.log
   if grep -C100 panic validator.log; then
-    echo "^^^ +++ Panic observed"
+    echo "^^^ +++"
+    echo "Panic observed"
     exit 1
   else
     echo "Validator log looks ok"
   fi
 else
-  echo "^^^ +++ Validator sanity disabled (NO_VALIDATOR_SANITY defined)"
+  echo "^^^ +++"
+  echo "Validator sanity disabled (NO_VALIDATOR_SANITY defined)"
 fi
 
 exit 0