From 471465a5f42f5c307f8be32a48f8fdab8cb3255d Mon Sep 17 00:00:00 2001
From: Michael Vines <mvines@gmail.com>
Date: Sun, 26 May 2019 11:17:07 -0700
Subject: [PATCH] net/:  Add solana-install test to sanity (#4438)

* Add instance creation date to motd

* Setup localtime

* Add solana-install test
---
 net/gce.sh                   | 18 ++++++++++++++----
 net/remote/remote-sanity.sh  | 20 +++++++++++++++++++-
 net/scripts/install-rsync.sh |  2 +-
 net/scripts/localtime.sh     | 10 ++++++++++
 4 files changed, 44 insertions(+), 6 deletions(-)
 create mode 100755 net/scripts/localtime.sh

diff --git a/net/gce.sh b/net/gce.sh
index e819067d63..e5521ded4b 100755
--- a/net/gce.sh
+++ b/net/gce.sh
@@ -522,20 +522,27 @@ create)
 
   printNetworkInfo() {
     cat <<EOF
-========================================================================================
-
-Network composition:
+==[ Network composition ]===============================================================
   Bootstrap leader = $bootstrapLeaderMachineType (GPU=$enableGpu)
   Additional fullnodes = $additionalFullNodeCount x $fullNodeMachineType
   Client(s) = $clientNodeCount x $clientMachineType
   Blockstreamer = $blockstreamer
-
 ========================================================================================
 
 EOF
   }
   printNetworkInfo
 
+  creationDate=$(date)
+  creationInfo() {
+    cat <<EOF
+
+  Instance running since: $creationDate
+
+========================================================================================
+EOF
+  }
+
   declare startupScript="$netConfigDir"/instance-startup-script.sh
   cat > "$startupScript" <<EOF
 #!/usr/bin/env bash
@@ -554,6 +561,7 @@ cat > /etc/motd <<EOM
     $ until [[ -f /.instance-startup-complete ]]; do sleep 1; done
 
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+$(creationInfo)
 EOM
 
 # Place the generated private key at /solana-id_ecdsa so it's retrievable by anybody
@@ -579,6 +587,7 @@ $(
     install-nodejs.sh \
     install-redis.sh \
     install-rsync.sh \
+    localtime.sh \
     network-config.sh \
     remove-docker-interface.sh \
 
@@ -590,6 +599,7 @@ $(
 
 cat > /etc/motd <<EOM
 $(printNetworkInfo)
+$(creationInfo)
 EOM
 
 touch /.instance-startup-complete
diff --git a/net/remote/remote-sanity.sh b/net/remote/remote-sanity.sh
index 11d592c9a9..047b465175 100755
--- a/net/remote/remote-sanity.sh
+++ b/net/remote/remote-sanity.sh
@@ -69,8 +69,9 @@ local|tar)
   entrypointRsyncUrl="$entrypointIp:~/solana"
 
   solana_gossip=solana-gossip
-  solana_ledger_tool=solana-ledger-tool
+  solana_install=solana-install
   solana_keygen=solana-keygen
+  solana_ledger_tool=solana-ledger-tool
 
   ledger=config-local/bootstrap-leader-ledger
   client_id=config-local/client-id.json
@@ -163,4 +164,21 @@ else
   echo "Note: validator sanity disabled"
 fi
 
+if [[ -r update_manifest_keypair.json ]]; then
+  echo "--- $entrypointIp: solana-install test"
+
+  (
+    set -x
+    update_manifest_pubkey=$($solana_keygen pubkey update_manifest_keypair.json)
+    rm -rf install-data-dir
+    $solana_install init \
+      --no-modify-path \
+      --data-dir install-data-dir \
+      --url http://"$entrypointIp":8899 \
+      --pubkey "$update_manifest_pubkey"
+
+    $solana_install info
+  )
+fi
+
 echo --- Pass
diff --git a/net/scripts/install-rsync.sh b/net/scripts/install-rsync.sh
index 75839229a1..7a6419554f 100755
--- a/net/scripts/install-rsync.sh
+++ b/net/scripts/install-rsync.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 #
-# Rsync setup for Snap builds
+# Rsync setup
 #
 set -ex
 
diff --git a/net/scripts/localtime.sh b/net/scripts/localtime.sh
new file mode 100755
index 0000000000..1e3076574b
--- /dev/null
+++ b/net/scripts/localtime.sh
@@ -0,0 +1,10 @@
+#!/usr/bin/env bash
+#
+# Setup timezone
+#
+set -ex
+
+[[ $(uname) = Linux ]] || exit 1
+[[ $USER = root ]] || exit 1
+
+ln -sf /usr/share/zoneinfo/America/Los_Angeles /etc/localtime