From 4febc170b71e5a6348614326523359017e2cd45b Mon Sep 17 00:00:00 2001
From: Scott Nowicki <scott@sgn-mbp>
Date: Tue, 18 Apr 2017 18:37:39 -0500
Subject: [PATCH 1/5] updated travis.yml for builds on terraform examples

---
 .travis.yml | 61 ++++++++++++++++++++---------------------------------
 1 file changed, 23 insertions(+), 38 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 04cc6f309..535c4831d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,42 +1,27 @@
-dist: trusty
-sudo: false
-language: go
-go:
-- 1.8
+language: generic
 
-# add TF_CONSUL_TEST=1 to run consul tests
-# they were causing timouts in travis
+# establish environment variables
 env:
-  - CONSUL_VERSION=0.7.5 GOMAXPROCS=4
+  - TEST_DIR=examples/101-vm-simple-linux
+#   global:
+#     - GH_USER_NAME="travis-ci"
+#     - GH_USER_EMAIL="mikedball@gmail.com"
+#     - GH_REPO="10thmagnitude/terraform"
+#     # encrypted GH_TOKEN and AWS credentials
+#     - secure: "EBtNoRGUNjgom7lk6+O7Zh9A33X/251Cg7j5C+HqfkPMQcQwS6MEAXPT1vbnh1HoQixR1e6VTHdXxvWyE/14+98qtJiHnSbGiY67ZvQNDuFLb2+PKx7xhhl9heNj8Xk1K1SYJtfYQZIvZNl32V9db6eR3r7kKlWlpUVmnSnXrnm4ztI8se45OX/XPjAnARdBvkpbcTSprrAf7Qudc5R86ain18tJah6PICd12TIH4Cpdcr6CVL8kRK808VH+AS2oii7QcKXc084gBOJJLCiwa2DrcSEPOOk0AIn5ft+XVcaCsV6oOc6NliFKEPoJkaxbYWtunDlnqgB6epuaGrf99TfCg4E9R8sXBFqJwdMGDu3xM6Nddw87tMj/oCbUmjrNnl4qAxIMBD2TdjwFS1lNaXAML8W/jx3bNGSEg5MAYrqLL32eJta/vxRJwpCVnXUHxef9JcZMNZcvuKMdHC98JQIYbGRRFZ0cFtqMe63tgWafCi3WS+FIqSWnGdiKZ7dS110ANHaiQkDAZKTlh/9YJpzR9LyOoq7xXYtQIUovyDD2j498mAkcgByEbyZ39k6xMvLHHXsdUq25tdaMvqE3ZUASIDWqDk1QPfxkXX6n62Tj2X1HCA+3JI/DKyEfzt3QV4rntiP4Qv9jSuxNpd47rgsgVFg+HGJmko9QzAA/g+E="
 
-# Fetch consul for the backend and provider tests
-before_install:
-  - curl -sLo consul.zip https://releases.hashicorp.com/consul/${CONSUL_VERSION}/consul_${CONSUL_VERSION}_linux_amd64.zip
-  - unzip consul.zip
-  - mkdir ~/bin
-  - mv consul ~/bin
-  - export PATH="~/bin:$PATH"
+# install terraform
+before_deploy:
+  - curl -fSL "https://releases.hashicorp.com/terraform/0.9.3/terraform_0.9.3_linux_amd64.zip" -o terraform.zip
+  - sudo unzip terraform.zip -d /opt/terraform
+  - sudo ln -s /opt/terraform/terraform /usr/bin/terraform
+  - rm -f terraform.zip
 
-install:
-# This script is used by the Travis build to install a cookie for
-# go.googlesource.com so rate limits are higher when using `go get` to fetch
-# packages that live there.
-# See: https://github.com/golang/go/issues/12933
-- bash scripts/gogetcookie.sh
-- go get github.com/kardianos/govendor
-script:
-- make vet vendor-status test
-- GOOS=windows go build
-branches:
-  only:
-  - master
-notifications:
-  irc:
-    channels:
-    - irc.freenode.org#terraform-tool
-    skip_join: true
-    use_notice: true
-matrix:
-  fast_finish: true
-  allow_failures:
-  - go: tip
+# terraform apply
+deploy:
+  - provider: script
+    skip_cleanup: true
+    script: "./deploy.sh"
+    on:
+      repo: 10thmagnitude/terraform
+      branch: 101-vm-simple-linux

From b7f8ae542a466a978cd749de1d21ac5b9a282ccb Mon Sep 17 00:00:00 2001
From: Scott Nowicki <scott@sgn-mbp>
Date: Tue, 18 Apr 2017 18:44:06 -0500
Subject: [PATCH 2/5] added directory to build matrix

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 535c4831d..8ef73ccb4 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -21,7 +21,7 @@ before_deploy:
 deploy:
   - provider: script
     skip_cleanup: true
-    script: "./deploy.sh"
+    script: cd $TEST_DIR && "./deploy.sh"
     on:
       repo: 10thmagnitude/terraform
       branch: 101-vm-simple-linux

From 601735b8733f8f6154994b3b7df28ae2cf74f713 Mon Sep 17 00:00:00 2001
From: Scott Nowicki <scott@sgn-mbp>
Date: Tue, 18 Apr 2017 19:10:41 -0500
Subject: [PATCH 3/5] updated .travis.yml to read branches prefixed with topic-

---
 .travis.yml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index 8ef73ccb4..f6887ef44 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -10,6 +10,11 @@ env:
 #     # encrypted GH_TOKEN and AWS credentials
 #     - secure: "EBtNoRGUNjgom7lk6+O7Zh9A33X/251Cg7j5C+HqfkPMQcQwS6MEAXPT1vbnh1HoQixR1e6VTHdXxvWyE/14+98qtJiHnSbGiY67ZvQNDuFLb2+PKx7xhhl9heNj8Xk1K1SYJtfYQZIvZNl32V9db6eR3r7kKlWlpUVmnSnXrnm4ztI8se45OX/XPjAnARdBvkpbcTSprrAf7Qudc5R86ain18tJah6PICd12TIH4Cpdcr6CVL8kRK808VH+AS2oii7QcKXc084gBOJJLCiwa2DrcSEPOOk0AIn5ft+XVcaCsV6oOc6NliFKEPoJkaxbYWtunDlnqgB6epuaGrf99TfCg4E9R8sXBFqJwdMGDu3xM6Nddw87tMj/oCbUmjrNnl4qAxIMBD2TdjwFS1lNaXAML8W/jx3bNGSEg5MAYrqLL32eJta/vxRJwpCVnXUHxef9JcZMNZcvuKMdHC98JQIYbGRRFZ0cFtqMe63tgWafCi3WS+FIqSWnGdiKZ7dS110ANHaiQkDAZKTlh/9YJpzR9LyOoq7xXYtQIUovyDD2j498mAkcgByEbyZ39k6xMvLHHXsdUq25tdaMvqE3ZUASIDWqDk1QPfxkXX6n62Tj2X1HCA+3JI/DKyEfzt3QV4rntiP4Qv9jSuxNpd47rgsgVFg+HGJmko9QzAA/g+E="
 
+branches:
+  only:
+  - master
+  - /^(?i:topic)-.*$/
+
 # install terraform
 before_deploy:
   - curl -fSL "https://releases.hashicorp.com/terraform/0.9.3/terraform_0.9.3_linux_amd64.zip" -o terraform.zip

From bbdb2cef53f55b85e0df48247ee7e0d14a55ad12 Mon Sep 17 00:00:00 2001
From: Scott Nowicki <scott@sgn-mbp>
Date: Wed, 19 Apr 2017 10:28:11 -0500
Subject: [PATCH 4/5] removed branch restrictions on deploy

---
 .travis.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index f6887ef44..69386fcf0 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -15,6 +15,9 @@ branches:
   - master
   - /^(?i:topic)-.*$/
 
+
+##todo: switch to before_script and script
+
 # install terraform
 before_deploy:
   - curl -fSL "https://releases.hashicorp.com/terraform/0.9.3/terraform_0.9.3_linux_amd64.zip" -o terraform.zip
@@ -27,6 +30,3 @@ deploy:
   - provider: script
     skip_cleanup: true
     script: cd $TEST_DIR && "./deploy.sh"
-    on:
-      repo: 10thmagnitude/terraform
-      branch: 101-vm-simple-linux

From ca65fe31cec12065866bedff0403457b9ee429b9 Mon Sep 17 00:00:00 2001
From: Scott Nowicki <scott@sgn-mbp>
Date: Wed, 19 Apr 2017 10:46:54 -0500
Subject: [PATCH 5/5] disabling travis deployment on master short-term

---
 .travis.yml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index 69386fcf0..c34013696 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -30,3 +30,7 @@ deploy:
   - provider: script
     skip_cleanup: true
     script: cd $TEST_DIR && "./deploy.sh"
+    on:
+      repo: 10thmagnitude/terraform
+      branch: 101-vm-simple-linux
+      condition: false  # re-enable when examples exist in master