Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
43 changes: 43 additions & 0 deletions terraform/getterraform
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
#!/bin/bash

VERSION=${VERSION:-"1.10.5"}


PROGNAME="${BASH_SOURCE[0]}"
HERE="$(cd "$(dirname "$PROGNAME")" &>/dev/null && pwd)"
READIES=$(cd $HERE/.. && pwd)
. $READIES/shibumi/defs

OS=`uname -s`
if [[ $OS == Linux ]]; then
OS=linux
elif [[ $OS == Darwin ]]; then
OS=darwin
elif [[ $OS == FreBSD ]]; then
OS=freebsd
else
echo "$OS: unsupported"
fi

ARCH=`uname -m`
if [[ $ARCH == x86_64 ]]; then
ARCH=amd64
elif [[ $ARCH == i686 ]]; then
ARCH=386
elif [[ $ARCH == aarch64 ]]; then
ARCH=arm64
elif [[ $ARCH == armv7l ]]; then
ARCH=arm
else
echo "$ARCH: unsupported"
exit 1
fi

dir=$(mktemp -d /tmp/tf.XXXXXX)
wget -q -O $dir/tf.zip https://releases.hashicorp.com/terraform/${VERSION}/terraform_${VERSION}_${OS}_${ARCH}.zip
cd $dir
unzip -q tf.zip
chmod +x terraform
mv terraform /usr/local/bin/
cd $HERE
rm -rf $dir
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ resource "aws_spot_instance_request" "server" {
user = var.ssh_user
private_key = file(var.private_key)
#need to increase timeout to larger then 5m for metal instances
timeout = "15m"
timeout = "8m"
agent = "false"
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ variable "public_key" {

variable "key_name" {
description = "key name"
default = "perf-ci"
default = "perf-cto-us-east-2"
}

variable "region" {
Expand Down
2 changes: 1 addition & 1 deletion terraform/oss-standalone-redistimeseries-m5/variables.tf
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ variable "public_key" {

variable "key_name" {
description = "key name"
default = "perf-ci"
default = "perf-cto-us-east-2"
}

variable "region" {
Expand Down