Merge pull request #36 from brettswift/feature/deploy-tagging

Introduce forced injection of namespace to acceptance tests

.gitignore

@@ -103,3 +103,4 @@ ENV/
 .mypy_cache/
 .idea
 .DS_Store
+dump

tests/stacker_test/conf/acceptance.env

@@ -1,10 +1,14 @@
 # Used for your dev environment:
 # http://stacker.readthedocs.io/en/latest/environments.html
-namespace: acc
+namespace: # to be passed into the CLI. You can use the same value as User below ie (whoami/$env:UserName)
 env: ac
 # If you want to run these tests yourself, reconfigure the below for your own account
 VpcId: vpc-894b89ef
 BaseDomain: playpen.dsl.aws.shaw.ca
 PrivateSubnets: subnet-7b8cba32,subnet-ed041b8a
-SshKeyName: stc-admin-March-2017-PLAYPEN
-ALBCertName: ${ssmstore us-west-2@/simpleweb/bswift/ALBCertName}
+SshKeyName: ${ssmstore us-west-2@/cumulus/acceptance/SshKeyName}
+ALBCertName: ${ssmstore us-west-2@/cumulus/acceptance/ALBCertName}
+
+# dynamic params expected to be set in the CLI. ex:  -e GitDescribe=`git describe --always --dirty`
+GitDescribe: notset # please set to `git describe --always --dirty`
+User: notset # please set to `whoami`  or `$env:UserName` (for windows)

tests/stacker_test/run-integration.sh

@@ -2,16 +2,18 @@
 
 #set -x
 ACCOUNT_ID=`aws sts get-caller-identity | jq .Account | tr -d '"' `
-NAMESPACE=acc # must match the namespace in the conf file
-
+NAMESPACE=`whoami`
+NAMESPACE_PARAM="-e namespace=${NAMESPACE}"
 echo "Using account: ${ACCOUNT_ID}"
 
 set -e #Important. Script will exit appropriately if there is an error.
 
-stacker build conf/acceptance.env stacker.yaml --recreate-failed -t --stacks pipelinesimple
+stacker build conf/acceptance.env stacker.yaml --recreate-failed -t \
+    --stacks pipelinesimple ${NAMESPACE_PARAM} \
+    -e GitDescribe=`git describe --always --dirty` -e User=`whoami`
 
-BUCKET_NAME=$(stacker info conf/acceptance.env stacker.yaml 2>&1 | grep PipelineBucket: | cut -f 3 -d " ")
-PIPELINE_NAME=$(stacker info conf/acceptance.env stacker.yaml 2>&1 | grep PipelineName | cut -f 3 -d " ")
+BUCKET_NAME=$(stacker info conf/acceptance.env stacker.yaml ${NAMESPACE_PARAM} 2>&1 | grep PipelineBucket: | cut -f 3 -d " ")
+PIPELINE_NAME=$(stacker info conf/acceptance.env stacker.yaml ${NAMESPACE_PARAM} 2>&1 | grep PipelineName | cut -f 3 -d " ")
 
 ARTIFACT_NAME='artifact.zip'
 TEMP_DIR='ac_build'
@@ -60,12 +62,12 @@ while [ $SECONDS -lt ${end} ]; do
 done
 
 
-SHOULD_DESTROY=false
+SHOULD_DESTROY=true
 if $SHOULD_DESTROY; then
     aws s3 rm s3://${BUCKET_NAME} --recursive
     python delete_bucket_versions.py ${BUCKET_NAME}
 
-    stacker destroy conf/acceptance.env stacker.yaml --force -t
+    stacker destroy conf/acceptance.env stacker.yaml ${NAMESPACE_PARAM} --force -t
 fi
 
 echo "Completing with exit code ${pipeline_result}"

tests/stacker_test/stacker.yaml

@@ -25,6 +25,11 @@ mappings:
       amazonLinux2: ami-a9d09ed1
 #      ami-31394949
 
+tags:
+    GitVersion: ${GitDescribe}
+    LastDeployedBy: ${User}
+
+
 # The stacks key accepts a list of stack declarations.
 # http://stacker.readthedocs.io/en/latest/config.html#stacks
 stacks: