Merge pull request #19 from gruntwork-io/release-fixes

Remove root folder path workaround

Author: brikis98

.circleci/config.yml

@@ -55,8 +55,8 @@ jobs:
       - run: gruntwork-install --module-name "build-helpers" --repo "https://github.com/gruntwork-io/module-ci" --tag "v0.7.1"
       - run: gruntwork-install --module-name "aws-helpers" --repo "https://github.com/gruntwork-io/module-ci" --tag "v0.7.1"
 
-      - run: ~/$CIRCLE_PROJECT_REPONAME/.circleci/publish-amis.sh "ubuntu-ami"
-      - run: ~/$CIRCLE_PROJECT_REPONAME/.circleci/publish-amis.sh "amazon-linux-ami"
+      - run: ~/project/.circleci/publish-amis.sh "ubuntu-ami"
+      - run: ~/project/.circleci/publish-amis.sh "amazon-linux-ami"
 
 workflows:
   version: 2

examples/couchbase-ami/couchbase.json

@@ -3,8 +3,7 @@
   "variables": {
     "aws_region": "us-east-1",
     "edition": "enterprise",
-    "base_ami_name": "couchbase",
-    "root_folder_path": "{{template_dir}}/../../../terraform-aws-couchbase/"
+    "base_ami_name": "couchbase"
   },
   "builders": [{
     "name": "ubuntu-ami",
@@ -109,7 +108,7 @@
     "inline": ["mkdir -p /tmp/terraform-aws-couchbase"]
   },{
     "type": "file",
-    "source": "{{user `root_folder_path`}}",
+    "source": "{{template_dir}}/../../",
     "destination": "/tmp/terraform-aws-couchbase"
   },{
     "type": "shell",

test/terratest_helpers.go

@@ -8,7 +8,6 @@ import (
 	"net/url"
 	"io/ioutil"
 	"strings"
-	"os"
 	"github.com/gruntwork-io/terratest/modules/logger"
 	"github.com/gruntwork-io/terratest/modules/packer"
 	"github.com/gruntwork-io/terratest/modules/aws"
@@ -54,17 +53,6 @@ func buildCouchbaseWithPackerE(t *testing.T, builderName string, baseAmiName str
 		},
 	}
 
-	// The Packer file provisioner we use tries to copy this entire Couchbase module using a relative path like
-	// ../../../terraform-aws-couchbase. This works fine in a normal checkout, but with CircleCi, (a) the code is
-	// checked out into a folder called "project" and not "terraform-aws-couchbase" and (b) to support GOPATH, we
-	// create a symlink to the original project and run the tests from that symlinked folder. One or both of these
-	// issues leads to very strange issues that sometimes cause the Packer build to fail:
-	// https://github.com/hashicorp/packer/issues/6103
-	if os.Getenv("CIRCLECI") != "" {
-		logger.Logf(t, "Overriding root folder path for Packer build to /home/circleci/project/")
-		options.Vars["root_folder_path"] = "/home/circleci/project/"
-	}
-
 	return packer.BuildAmiE(t, options)
 }