Commit Graph

94 Commits

Author SHA1 Message Date
Jake Champlin 3d396e108a
fix travis for unit tests 2017-07-13 13:19:24 -04:00
Annie Hedgpeth 7ac8837cc0 provider/azurerm: Add example of Spark and Cassrandra on CentOS (#15123)
* initial commit - 101-vm-from-user-image

* changed branch name

* not deploying - storage problems

* provisions vm but image not properly prepared

* storage not correct

* provisions properly

* changed main.tf to azuredeploy.tf

* added tfvars and info for README

* tfvars ignored and corrected file ext

* added CI config; added sane defaults for variables; updated deployment script, added mac specific deployment for local testing

* deploy.sh to be executable

* executable deploy files

* added CI files; changed vars

* prep for PR

* removal of old folder

* prep for PR

* wrong args for travis

* more PR prep

* updated README

* commented out variables in terraform.tfvars

* Topic 101 vm from user image (#2)

* initial commit - 101-vm-from-user-image
* added tfvars and info for README
* added CI config; added sane defaults for variables; updated deployment script, added mac specific deployment for local testing
* prep for PR

* added new template

* oops, left off master

* prep for PR

* correct repository for destination

* renamed scripts to be more intuitive; added check for docker

* merge vm simple; vm from image

* initial commit

* deploys locally

* updated deploy

* consolidated deploy and after_deploy into a single script; simplified ci process; added os_profile_linux_config

* added terraform show

* changed to allow http & https (like ARM tmplt)

* changed host_name & host_name variable desc

* added az cli check

* on this branch, only build test_dir; master will aggregate all the examples

* merge master

* added new constructs/naming for deploy scripts, etc.

* suppress az login output

* suppress az login output

* forgot about line breaks

* breaking build as an example

* fixing broken build example

* merge of CI config

* fixed grammar in readme

* prep for PR

* took out armviz button and minor README changes

* changed host_name

* fixed merge conflicts

* changed host_name variable

* updating Hashicorp's changes to merged simple linux branch

* updating files to merge w/master and prep for Hashicorp pr

* Revert "updating files to merge w/master and prep for Hashicorp pr"

This reverts commit b850cd5d2a858eff073fc5a1097a6813d0f8b362.

* Revert "updating Hashicorp's changes to merged simple linux branch"

This reverts commit dbaf8d14a9cdfcef0281919671357f6171ebd4e6.

* removing vm from user image example from this branch

* removed old branch

* azure-2-vms-loadbalancer-lbrules (#13)

* initial commit

* need to change lb_rule & nic

* deploys locally

* updated README

* updated travis and deploy scripts for Hari's repo

* renamed deploy script

* clean up

* prep for PR

* updated readme

* fixing conflict in .travis.yml

* initial commit; in progress

* in progress

* in progress; encryption fails

* in progress

* deploys successfully locally

* clean up; deploy typo fixed

* merging hashi master into this branch

* troubleshooting deploy

* added missing vars to deploy script

* updated README, outputs, and added graph

* simplified outputs

* provisions locally

* cleaned up vars

* fixed chart on README

* prepping for pr

* fixed merge conflict

* switching to Hashicorp's .travis.yml

* edited comments

* removed graph

* reverting travis.yml to original

added return line at 45
2017-06-08 19:38:34 +03:00
Jake Champlin 76e99dcff4
update travis to catch vet failures 2017-05-19 09:12:56 -04:00
Paul Stack 0837a763f3 Bump travis builds to go 1.8.1 (#14549) 2017-05-16 20:05:23 +03:00
Annie Hedgpeth 8e7f3cc09d provider/azurerm: Add example of a VNET w/ Two Subnets (#14115)
* merge master

* added new constructs/naming for deploy scripts, etc.

* suppress az login output

* removed .tfvars and provider.tf; updated prev merge

* reverted .travis.yml back to Hashicorp's

* Reverting back to the Hashicorp travis file
2017-05-04 10:57:54 +01:00
anniehedgpeth 93164799e7 .travis.yml reverted back to hashicorp's master .travis.yml 2017-05-02 14:33:52 -05:00
Scott Nowicki 291305bddb run CI on branch prior to merge 2017-04-27 19:47:01 -05:00
Scott Nowicki 001acd666c merge upstream 2017-04-27 18:11:47 -05:00
Scott Nowicki 121a60192f Enabled CI runs for master
This should enable CI on PRs for examples (until an example PR is merged)
2017-04-27 18:00:43 -05:00
Scott Nowicki 77775462ff consolidated deploy and after_deploy into a single script; simplified ci process; added os_profile_linux_config 2017-04-27 12:16:00 -05:00
Scott Nowicki 64b52ee25f merge upstream 2017-04-27 11:44:57 -05:00
Scott Nowicki 829b69625b early prep for CI of examples (#7)
* early prep for CI of examples
* added note to prevent moving upstream
2017-04-27 11:40:53 -05:00
Scott Nowicki 56f6aa16c4 renamed scripts to be more intuitive; added check for docker 2017-04-26 21:53:25 -05:00
Scott Nowicki f635bbd031 updated build dir 2017-04-26 20:48:45 -05:00
Scott Nowicki 3a77aafe49 merge upstream 2017-04-24 19:40:17 -05:00
Scott Nowicki 2362bd7e8f merge upstream 2017-04-24 15:02:59 -05:00
Scott Nowicki afb164b79a Topic 101 vm simple linux (#1)
* added .travis.yml and deploy.sh
* added deploy script, updated travis.yml to build topic- branches
* generate random string for hostname
* plan now produces output plan, apply now consumes outputted plan
* cleanup; sane defaults
* explicit build dirs
2017-04-24 14:57:28 -05:00
Scott Nowicki 942c23a554 Merge branch 'master' into topic-101-vm-simple-linux 2017-04-24 14:35:48 -05:00
Scott Nowicki 938402edba bad syntax 2017-04-24 13:43:38 -05:00
Scott Nowicki 441b86ac86 explicit build dirs 2017-04-24 13:40:07 -05:00
Scott Nowicki 679aa2e014 run script in wrong dir 2017-04-24 13:30:03 -05:00
Scott Nowicki fcffe2d82b easier to export in before_deploy block 2017-04-24 13:27:00 -05:00
Scott Nowicki d4ea91a029 removal of extra cd 2017-04-24 13:14:02 -05:00
Scott Nowicki d0e8c2816c fixed travis cfg 2017-04-24 13:09:53 -05:00
Scott Nowicki 986b0682ea travis syntax changes 2017-04-24 12:50:47 -05:00
Scott Nowicki ccfdc3c6c3 branch restrictions 2017-04-24 12:17:22 -05:00
Scott Nowicki 02952cac6f cleanup/reorg 2017-04-24 12:14:07 -05:00
Scott Nowicki 3e498199e9 fixed broken syntax for travis 2017-04-24 12:02:06 -05:00
Scott Nowicki 9a7e42459b cleanup; sane defaults 2017-04-24 11:45:24 -05:00
Scott Nowicki 277683833e cleanup 2017-04-24 09:23:15 -05:00
Scott Nowicki 6c3c85d05f simplified deploy.sh, fixed after_deploy delete via cli 2017-04-20 19:46:42 -05:00
Scott Nowicki 20d8a07ad0 azure cli after_deploy step working properly; cleanup 2017-04-20 15:45:05 -05:00
Scott Nowicki 10f48d565e cleaned up argument passing;removed quotes from container args 2017-04-20 14:10:54 -05:00
Scott Nowicki f04718040c env vars need quotes 2017-04-20 13:57:49 -05:00
Scott Nowicki 3a1adfc3e1 simplified travis.yml and deploy.sh 2017-04-20 13:44:23 -05:00
Scott Nowicki 60b20817b4 service docker required, despite docker already running 2017-04-20 12:52:12 -05:00
Scott Nowicki 8ed7e81255 invalid path for travis 2017-04-20 12:49:23 -05:00
Scott Nowicki 017b469ee6 mount pwd to container for terraform 2017-04-20 12:46:43 -05:00
Scott Nowicki 3f9d6a2111 no need to pull images 2017-04-20 12:38:00 -05:00
Scott Nowicki 602559f3f7 updated travis file to use docker for pre_deploy/deploy/after_deploy 2017-04-20 12:34:32 -05:00
Scott Nowicki f117f1de26 trying terraform 0.9.2 for destroy bug; fixed interpolation issue with sshCommand 2017-04-20 00:43:32 -05:00
Scott Nowicki 87b049b72d adding cd to after_deploy to ensure we're in the correct directory 2017-04-19 23:26:28 -05:00
Scott Nowicki 36e4b74c13 added -force to after_deploy 2017-04-19 20:32:22 -05:00
Scott Nowicki bf5d9773e2 fixed after_deploy syntax for .travis.yml 2017-04-19 20:23:07 -05:00
Scott Nowicki af3de7b7df azure is awfully particular for certain strings 2017-04-19 19:36:16 -05:00
Scott Nowicki e0208f48ba added after_deploy step to travis.yml; updated string generation yet again 2017-04-19 19:29:36 -05:00
Scott Nowicki 048ab5a774 renamed folder; updated deployment script; prompt for additional variables 2017-04-19 17:59:56 -05:00
Scott Nowicki 3ce7a2499a add execute permissions to deploy.sh file 2017-04-19 10:59:21 -05:00
Scott Nowicki d8131c2d5e cleanup; permitted topic branch 2017-04-19 10:51:07 -05:00
Scott Nowicki ca65fe31ce disabling travis deployment on master short-term 2017-04-19 10:46:54 -05:00