Commit 5187e4d8 by Edward Zarecor

Merge pull request #1842 from edx/e0d/cherry-pick-tagging

resolved merge conflicts
parents 04ac827e 05887a1e
...@@ -22,6 +22,9 @@ env ...@@ -22,6 +22,9 @@ env
export PYTHONUNBUFFERED=1 export PYTHONUNBUFFERED=1
export BOTO_CONFIG=/var/lib/jenkins/${aws_account}.boto export BOTO_CONFIG=/var/lib/jenkins/${aws_account}.boto
# This DATE_TIME will be used as instance launch time tag
TERMINATION_DATE_TIME=`date +"%m-%d-%Y %T" --date="-7 days ago"`
if [[ -z $BUILD_USER ]]; then if [[ -z $BUILD_USER ]]; then
BUILD_USER=jenkins BUILD_USER=jenkins
fi fi
...@@ -198,6 +201,7 @@ instance_tags: ...@@ -198,6 +201,7 @@ instance_tags:
Name: $name_tag Name: $name_tag
source: jenkins source: jenkins
owner: $BUILD_USER owner: $BUILD_USER
instance_termination_time: $TERMINATION_DATE_TIME
datadog: monitored datadog: monitored
root_ebs_size: $root_ebs_size root_ebs_size: $root_ebs_size
name_tag: $name_tag name_tag: $name_tag
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment