Merge branch 'master' into feature/website

4 files changed, 34 insertions, 1 deletions

diff --git a/script/dev-clean.sh b/script/dev-clean.sh
new file mode 100755
index 00000000..151c5547
--- /dev/null
+++ b/script/dev-clean.sh
@@ -0,0 +1,7 @@
+#!/bin/bash
+
+set -ex
+
+killall -9 garage || echo "garage is not running"
+rm -rf /tmp/garage*
+rm -rf /tmp/config.*.toml
diff --git a/script/dev-configure.sh b/script/dev-configure.sh
index 8b7392c6..698c7ed9 100755
--- a/script/dev-configure.sh
+++ b/script/dev-configure.sh
@@ -6,6 +6,11 @@ GARAGE_DEBUG="${REPO_FOLDER}/target/debug/"
 GARAGE_RELEASE="${REPO_FOLDER}/target/release/"
 PATH="${GARAGE_DEBUG}:${GARAGE_RELEASE}:$PATH"
 
+until garage status 2>&1|grep -q Healthy ; do 
+	echo "cluster starting..."
+	sleep 1
+done
+
 garage status \
 	| grep UNCONFIGURED \
 	| grep -Po '^[0-9a-f]+' \
diff --git a/script/dev-env.sh b/script/dev-env.sh
index 61c8618f..a2829c73 100755
--- a/script/dev-env.sh
+++ b/script/dev-env.sh
@@ -12,4 +12,3 @@ export AWS_DEFAULT_REGION='garage'
 
 alias s3grg="aws s3 \
   --endpoint-url http://127.0.0.1:3900"
-
diff --git a/script/test-smoke.sh b/script/test-smoke.sh
new file mode 100755
index 00000000..7b462b00
--- /dev/null
+++ b/script/test-smoke.sh
@@ -0,0 +1,22 @@
+#!/bin/bash
+
+set -ex
+shopt -s expand_aliases
+
+SCRIPT_FOLDER="`dirname \"$0\"`"
+REPO_FOLDER="${SCRIPT_FOLDER}/../"
+
+cargo build
+${SCRIPT_FOLDER}/dev-clean.sh
+${SCRIPT_FOLDER}/dev-cluster.sh > /tmp/garage.log 2>&1 &
+${SCRIPT_FOLDER}/dev-configure.sh
+${SCRIPT_FOLDER}/dev-bucket.sh
+source ${SCRIPT_FOLDER}/dev-env.sh
+
+dd if=/dev/urandom of=/tmp/garage.rnd bs=1M count=10
+
+s3grg put /tmp/garage.rnd s3://eprouvette/
+s3grg ls s3://eprouvette
+s3grg get s3://eprouvette/garage.rnd /tmp/garage.dl
+
+diff /tmp/garage.rnd /tmp/garage.dl