diff --git a/.travis.yml b/.travis.yml index 42e207da6b..6180da4dec 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,3 +1,7 @@ +#################################################################################### +## NOT FOR UPSTREAM PROPOSAL; INTENDED FOR CI OF AZURE EXAMPLES IN THIS REPO ONLY ## +#################################################################################### + sudo: required services: @@ -5,14 +9,19 @@ services: language: generic +# on branches: ignore multiple commits that will queue build jobs, just run latest commit +git: + depth: 1 + # establish environment variables env: - - TEST_DIR=examples/azure-cdn-with-storage-account + - TEST_DIR=examples/azure-vm-simple-linux-managed-disk + - TEST_DIR=examples/azure-vnet-two-subnets branches: only: -# - master - - /^(?i:topic)-.*$/ + - master + - /^(?i:topic)-.*$/ # install terraform before_deploy: @@ -26,4 +35,4 @@ deploy: script: cd $TRAVIS_BUILD_DIR/$TEST_DIR && ./deploy.ci.sh on: repo: harijayms/terraform - branch: topic-201-cdn-with-storage-account + branch: master \ No newline at end of file diff --git a/examples/azure-cdn-with-storage-account/deploy.ci.sh b/examples/azure-cdn-with-storage-account/deploy.ci.sh index 3fd0efac3f..3ccc9b9ece 100755 --- a/examples/azure-cdn-with-storage-account/deploy.ci.sh +++ b/examples/azure-cdn-with-storage-account/deploy.ci.sh @@ -28,4 +28,4 @@ docker run --rm -it \ --workdir=/data \ --entrypoint "/bin/sh" \ hashicorp/terraform:light \ - -c "/bin/terraform destroy -force -var resource_group=$KEY;" + -c "/bin/terraform destroy -force -var resource_group=$KEY;" \ No newline at end of file diff --git a/examples/azure-cdn-with-storage-account/deploy.mac.sh b/examples/azure-cdn-with-storage-account/deploy.mac.sh index 9c6563f07d..dfc34c2be2 100755 --- a/examples/azure-cdn-with-storage-account/deploy.mac.sh +++ b/examples/azure-cdn-with-storage-account/deploy.mac.sh @@ -12,4 +12,4 @@ if docker -v; then else echo "Docker is used to run terraform commands, please install before run: https://docs.docker.com/docker-for-mac/install/" -fi +fi \ No newline at end of file diff --git a/examples/azure-cdn-with-storage-account/main.tf b/examples/azure-cdn-with-storage-account/main.tf index 1f9c9ecbf8..2e7f56954c 100644 --- a/examples/azure-cdn-with-storage-account/main.tf +++ b/examples/azure-cdn-with-storage-account/main.tf @@ -1,3 +1,10 @@ +# provider "azurerm" { +# subscription_id = "REPLACE-WITH-YOUR-SUBSCRIPTION-ID" +# client_id = "REPLACE-WITH-YOUR-CLIENT-ID" +# client_secret = "REPLACE-WITH-YOUR-CLIENT-SECRET" +# tenant_id = "REPLACE-WITH-YOUR-TENANT-ID" +# } + resource "azurerm_resource_group" "rg" { name = "${var.resource_group}" location = "${var.location}" diff --git a/examples/azure-cdn-with-storage-account/provider.tf.example b/examples/azure-cdn-with-storage-account/provider.tf.example deleted file mode 100644 index 79291f7ca8..0000000000 --- a/examples/azure-cdn-with-storage-account/provider.tf.example +++ /dev/null @@ -1,7 +0,0 @@ -# provider "azurerm" { -# subscription_id = "REPLACE-WITH-YOUR-SUBSCRIPTION-ID" -# client_id = "REPLACE-WITH-YOUR-CLIENT-ID" -# client_secret = "REPLACE-WITH-YOUR-CLIENT-SECRET" -# tenant_id = "REPLACE-WITH-YOUR-TENANT-ID" -# } - diff --git a/examples/azure-cdn-with-storage-account/terraform.tfvars b/examples/azure-cdn-with-storage-account/terraform.tfvars deleted file mode 100644 index bee98e4e11..0000000000 --- a/examples/azure-cdn-with-storage-account/terraform.tfvars +++ /dev/null @@ -1,8 +0,0 @@ -# Replace with relevant values - -# resource_group = "myresourcegroup" -# rg_prefix = "rg" -# hostname = "myvm" -# dns_name = "mydnsname" -# location = "southcentralus" -# admin_password = "T3rr@f0rmP@ssword"