Merge corvo/define-partitioned-work and resolve conflicts

Author: glyh

automation/services/echo/README.md

@@ -4,7 +4,7 @@ This is a simple node service that listens for transactions to a specific addres
 
 ## Usage
 
-First you'll need to have a `mina` daemon running on your machine. See [the docs for instructions](https://docs.minaprotocol.com/en/node-operators/getting-started) on getting a node, then run the following command:
+First you'll need to have a `mina` daemon running on your machine. See [the docs for instructions](https://docs.minaprotocol.com/node-operators) on getting a node, then run the following command:
 
 ```
 $ mina daemon -rest-port 49370 -peer beta.o1test.net:8303

automation/services/faucet/README.md

@@ -4,7 +4,7 @@ The faucet service is a simple Discord bot that listens for requests for `CODA`
 
 ## Usage
 
-First you'll need to have a `coda` daemon running on your machine. See the docs [here](https://docs.minaprotocol.com/en/node-operators/getting-started) for instructions on getting a node, then run the following command:
+First you'll need to have a `coda` daemon running on your machine. See the docs [here](https://docs.minaprotocol.com/node-operators) for instructions on getting a node, then run the following command:
 
 ```
 $ mina daemon -rest-port 49370 -peer beta.o1test.net:8303

buildkite/scripts/check-compatibility.sh

@@ -15,7 +15,7 @@ function image_tag {
     IMAGE_TAG="$SHA-bullseye-berkeley"
 }
 
-function download-docker {
+function download_docker {
    SHA=$1
    image_tag $SHA
    docker pull gcr.io/o1labs-192920/mina-daemon:$IMAGE_TAG
@@ -27,7 +27,7 @@ function try_docker_shas {
     for sha in $DOCKER_SHAS; do
 
         set +e
-        download-docker $sha
+        download_docker $sha
 
         if [ $? -eq 0 ] ; then
             GOT_DOCKER=1

buildkite/scripts/debian/import_key.sh

@@ -0,0 +1,24 @@
+#!/bin/bash
+
+set -eo pipefail
+
+print_usage() {
+  echo "Usage: $0 [-s|--silent] [-h|--help]"
+}
+
+SILENT=0
+KEY_LOCATION="/var/secrets/debian/key.gpg"
+
+while [[ "$#" -gt 0 ]]; do case $1 in
+  -s|--silent) SILENT=1; ;;
+  -h|--help) print_usage; exit 0;;
+  *) echo "Unknown parameter passed: $1"; print_usage; exit 1;;
+esac; shift; done
+
+sudo chown -R opam ~/.gnupg/
+if [ $SILENT == 1 ]; then
+  gpg --batch --yes --import "$KEY_LOCATION"
+else 
+  echo "Importing GPG key"
+  gpg --import "$KEY_LOCATION"
+ fi