From f64b8eaf00bdf82f46368702bcec85f1f9e25749 Mon Sep 17 00:00:00 2001
From: "W. Trevor King" <wking@tremily.us>
Date: Thu, 26 Jul 2018 13:47:43 -0700
Subject: [PATCH] cluster-launch-installer-e2e: Set expirationDate tags

For four hours in the future.  Successful runs are currently taking
around 40 minutes [1], so this gives us a reasonable buffer without
leaving leaked resources around forever.

[1]: https://deck-ci.svc.ci.openshift.org/?job=pull-ci-origin-installer-e2e-aws&state=success
---
 cluster/ci/config/prow/jobs/cluster-launch-installer-e2e.yaml | 1 +
 cluster/test-deploy/aws/openshift.yaml                        | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/cluster/ci/config/prow/jobs/cluster-launch-installer-e2e.yaml b/cluster/ci/config/prow/jobs/cluster-launch-installer-e2e.yaml
index 343097b8fee6a..2ff5e2e8cb8f2 100644
--- a/cluster/ci/config/prow/jobs/cluster-launch-installer-e2e.yaml
+++ b/cluster/ci/config/prow/jobs/cluster-launch-installer-e2e.yaml
@@ -191,6 +191,7 @@ objects:
           export EMAIL=test@ci.openshift.io
           export PASSWORD=$( date +%s | sha256sum | base64 | head -c 32 ; echo )
           export EC2_AMI_OVERRIDE=ami-02323e873420d8eab
+          export EXPIRATION_DATE=$( date -d '4 hours' --iso=minutes --utc )
           cat /etc/openshift-installer/openshift.yaml | envsubst > /tmp/cluster/inputs.yaml
         )
         echo "Invoking installer ..."
diff --git a/cluster/test-deploy/aws/openshift.yaml b/cluster/test-deploy/aws/openshift.yaml
index a1f3c832cd1ad..341baf80e3040 100644
--- a/cluster/test-deploy/aws/openshift.yaml
+++ b/cluster/test-deploy/aws/openshift.yaml
@@ -73,7 +73,7 @@ aws:
   # (optional) Extra AWS tags to be applied to created resources.
   #
   # Example: `{ "key" = "value", "foo" = "bar" }`
-  # extraTags:
+  extraTags: {"expirationDate" = "${EXPIRATION_DATE}"}
 
   # (optional) Name of IAM role to use to access AWS in order to deploy the Tectonic Cluster.
   # The name is also the full role's ARN.