fix: require less manual interaction
Something has been up with @digitalocean instances that was requiring some additional human interaction. Tweaked the upgrade command to work around that. Added some additional pieces of information and moved the speed test to use JSON output instead of text for easier parsing.
This commit is contained in:
parent
a7def501f9
commit
7bc0a67eab
1 changed files with 11 additions and 4 deletions
15
run.sh
15
run.sh
|
@ -14,7 +14,11 @@ SPEEDTEST_SERVER=1774
|
|||
swapoff -a
|
||||
|
||||
apt-get update
|
||||
apt-get upgrade -y
|
||||
|
||||
apt-get upgrade -q -y -u -o Dpkg::Options::="--force-confdef" \
|
||||
--allow-downgrades --allow-remove-essential --allow-change-held-packages \
|
||||
--allow-change-held-packages --allow-unauthenticated
|
||||
|
||||
apt-get install sysbench nginx mysql-server python redis-server -y
|
||||
|
||||
wget -O speedtest-cli https://raw.githubusercontent.com/sivel/speedtest-cli/master/speedtest.py
|
||||
|
@ -23,6 +27,9 @@ chmod +x speedtest-cli
|
|||
mkdir results
|
||||
|
||||
cat /proc/cpuinfo > results/proc-cpuinfo.txt
|
||||
uname -a > results/uname-a.txt
|
||||
mysql --version > results/mysql-version.txt
|
||||
redis-server --version > results/redis-server-version.txt
|
||||
|
||||
sysbench cpu run > results/sysbench-cpu.txt
|
||||
|
||||
|
@ -60,9 +67,9 @@ done
|
|||
|
||||
redis-benchmark -q -n 100000 --csv > results/redis-benchmark.txt
|
||||
|
||||
./speedtest-cli --json --secure --single --server="$SPEEDTEST_SERVER" > results/speedtest1.txt
|
||||
./speedtest-cli --json --secure --single --server="$SPEEDTEST_SERVER" > results/speedtest2.txt
|
||||
./speedtest-cli --json --secure --single --server="$SPEEDTEST_SERVER" > results/speedtest3.txt
|
||||
./speedtest-cli --json --secure --single --server="$SPEEDTEST_SERVER" > results/speedtest1.json
|
||||
./speedtest-cli --json --secure --single --server="$SPEEDTEST_SERVER" > results/speedtest2.json
|
||||
./speedtest-cli --json --secure --single --server="$SPEEDTEST_SERVER" > results/speedtest3.json
|
||||
|
||||
# Wraps it all up in a nice package
|
||||
tar -zcvf "results-$PROVIDER.tgz" results
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue