Remove snap support

ci/buildkite-secondary.yml

@@ -1,7 +1,4 @@
 steps:
-  #- command: "ci/publish-snap.sh"
-  #  timeout_in_minutes: 40
-  #  name: "publish snap"
   - command: "sdk/docker-solana/build.sh"
     timeout_in_minutes: 20
     name: "publish docker"

ci/buildkite.yml

@@ -26,10 +26,6 @@ steps:
   #   timeout_in_minutes: 20
   #   agents:
   #     - "queue=large"
-  - command: "ci/pr-snap.sh"
-    timeout_in_minutes: 20
-    name: "snap"
-    branches: "pull/*"
   - wait
   - trigger: "solana-secondary"
     branches: "!pull/*"

ci/docker-run.sh

@@ -71,7 +71,6 @@ ARGS+=(
   --env CI
   --env CODECOV_TOKEN
   --env CRATES_IO_TOKEN
-  --env SNAPCRAFT_CREDENTIALS_KEY
 )
 
 if $INTERACTIVE; then

ci/docker-snapcraft/Dockerfile

@@ -1,7 +0,0 @@
-FROM snapcraft/xenial-amd64
-
-# Update snapcraft to latest version
-RUN apt-get update -qq \
- && apt-get install -y snapcraft daemontools \
- && rm -rf /var/lib/apt/lists/* \
- && snapcraft --version

ci/docker-snapcraft/build.sh

@@ -1,7 +0,0 @@
-#!/usr/bin/env bash
-set -ex
-
-cd "$(dirname "$0")"
-
-docker build -t solanalabs/snapcraft .
-docker push solanalabs/snapcraft

ci/pr-snap.sh

@@ -1,13 +0,0 @@
-#!/usr/bin/env bash
-#
-# Only run publish-snap.sh for pull requests that modify files under /snap
-#
-set -e
-cd "$(dirname "$0")"/..
-
-ci/affects-files.sh ^snap/ || {
-  echo "Skipping snap build as no files under /snap were modified"
-  exit 0
-}
-
-exec ci/publish-snap.sh

ci/publish-snap.sh

@@ -1,65 +0,0 @@
-#!/usr/bin/env bash
-set -e
-
-cd "$(dirname "$0")/.."
-
-# This job doesn't run within a container, try once to upgrade tooling on a
-# version check failure
-ci/version-check-with-upgrade.sh stable
-
-DRYRUN=
-if [[ -z $BUILDKITE_BRANCH ]]; then
-  DRYRUN="echo"
-fi
-
-if ./ci/is-pr.sh; then
-  DRYRUN="echo"
-  CHANNEL="none (pullrequest)"
-fi
-
-eval "$(ci/channel-info.sh)"
-
-if [[ -z $CHANNEL ]]; then
-  echo Unable to determine channel to publish into, exiting.
-  exit 1
-fi
-
-if [[ -z $DRYRUN ]]; then
-  [[ -n $SNAPCRAFT_CREDENTIALS_KEY ]] || {
-    echo SNAPCRAFT_CREDENTIALS_KEY not defined
-    exit 1;
-  }
-  (
-    openssl aes-256-cbc -d \
-      -in ci/snapcraft.credentials.enc \
-      -out ci/snapcraft.credentials \
-      -k "$SNAPCRAFT_CREDENTIALS_KEY"
-
-    snapcraft login --with ci/snapcraft.credentials
-  ) || {
-    rm -f ci/snapcraft.credentials;
-    exit 1
-  }
-fi
-
-set -x
-
-echo --- checking for multilog
-if [[ ! -x /usr/bin/multilog ]]; then
-  if [[ -z $CI ]]; then
-    echo "multilog not found, install with: sudo apt-get install -y daemontools"
-    exit 1
-  fi
-  sudo apt-get install -y daemontools
-fi
-
-echo "--- build: $CHANNEL channel"
-snapcraft
-
-source ci/upload-ci-artifact.sh
-upload-ci-artifact solana_*.snap
-
-if [[ -z $DO_NOT_PUBLISH_SNAP ]]; then
-  echo "--- publish: $CHANNEL channel"
-  $DRYRUN snapcraft push solana_*.snap --release "$CHANNEL"
-fi

ci/testnet-deploy.sh

@@ -11,13 +11,11 @@ clientNodeCount=0
 additionalFullNodeCount=10
 publicNetwork=false
 skipSetup=false
-snapChannel=edge
 tarChannelOrTag=edge
 delete=false
 enableGpu=false
 bootDiskType=""
 leaderRotation=true
-useTarReleaseChannel=false
 blockstreamer=false
 
 usage() {
@@ -36,8 +34,6 @@ Deploys a CD testnet
   zone  - cloud provider zone to deploy the network into
 
   options:
-   -s edge|beta|stable  - Deploy the specified Snap release channel
-                          (default: $snapChannel)
    -t edge|beta|stable|vX.Y.Z  - Deploy the latest tarball release for the
                                  specified release channel (edge|beta|stable) or release tag
                                  (vX.Y.Z)
@@ -69,7 +65,7 @@ zone=$3
 [[ -n $zone ]] || usage "Zone not specified"
 shift 3
 
-while getopts "h?p:Pn:c:s:t:gG:a:Dbd:ru" opt; do
+while getopts "h?p:Pn:c:t:gG:a:Dbd:ru" opt; do
   case $opt in
   h | \?)
     usage
@@ -83,21 +79,10 @@ while getopts "h?p:Pn:c:s:t:gG:a:Dbd:ru" opt; do
   c)
     clientNodeCount=$OPTARG
     ;;
-  s)
-    case $OPTARG in
-    edge|beta|stable)
-      snapChannel=$OPTARG
-      ;;
-    *)
-      usage "Invalid snap channel: $OPTARG"
-      ;;
-    esac
-    ;;
   t)
     case $OPTARG in
     edge|beta|stable|v*)
       tarChannelOrTag=$OPTARG
-      useTarReleaseChannel=true
       ;;
     *)
       usage "Invalid release channel: $OPTARG"
@@ -242,14 +227,8 @@ ok=true
     op=start
   fi
 
-  if $useTarReleaseChannel; then
-    deploySource="-t $tarChannelOrTag"
-  else
-    deploySource="-s $snapChannel"
-  fi
-
   # shellcheck disable=SC2086 # Don't want to double quote maybeRejectExtraNodes
-  time net/net.sh $op $deploySource \
+  time net/net.sh $op -t "$tarChannelOrTag" \
     $maybeSkipSetup $maybeRejectExtraNodes $maybeNoValidatorSanity $maybeNoLedgerVerify
 ) || ok=false
 

ci/testnet-manager.sh

@@ -239,7 +239,7 @@ start() {
           ${maybeReuseLedger:+-r} \
           ${maybeDelete:+-D}
         #ci/testnet-deploy.sh testnet-solana-com gce us-east1-c \
-        #  -s "$CHANNEL_OR_TAG" -n 3 -c 0 -P -a testnet-solana-com  \
+        #  -t "$CHANNEL_OR_TAG" -n 3 -c 0 -P -a testnet-solana-com  \
         #  ${maybeReuseLedger:+-r} \
         #  ${maybeDelete:+-D}
     )