From 056b5e14c261ef4f90b1406f3fb439b6c1d8f6c5 Mon Sep 17 00:00:00 2001
From: Isaac Hollander McCreery <ihmccreery@users.noreply.github.com>
Date: Tue, 26 Jan 2016 09:10:06 -0800
Subject: [PATCH] Revert "Add AWS jobs to source control."

---
 hack/jenkins/job-configs/global.yaml         |  2 --
 hack/jenkins/job-configs/kubernetes-e2e.yaml | 26 +-------------------
 2 files changed, 1 insertion(+), 27 deletions(-)

diff --git a/hack/jenkins/job-configs/global.yaml b/hack/jenkins/job-configs/global.yaml
index d762c1bfc1..6a04d68529 100644
--- a/hack/jenkins/job-configs/global.yaml
+++ b/hack/jenkins/job-configs/global.yaml
@@ -62,5 +62,3 @@
 - defaults:
     name: global
     emails: '$DEFAULT_RECIPIENTS'
-    cron-string: 'H/30 * * * *'
-    disabled: false
diff --git a/hack/jenkins/job-configs/kubernetes-e2e.yaml b/hack/jenkins/job-configs/kubernetes-e2e.yaml
index fa7fa1b214..fab56c186d 100644
--- a/hack/jenkins/job-configs/kubernetes-e2e.yaml
+++ b/hack/jenkins/job-configs/kubernetes-e2e.yaml
@@ -1,7 +1,6 @@
 - job-template:
     name: 'kubernetes-e2e-{suffix}'
     description: '{description} Test owner: {test-owner}.'
-    disabled: '{disabled}'
     logrotate:
         daysToKeep: 7
     builders:
@@ -20,7 +19,7 @@
         - reverse:
             jobs: '{trigger-job}'
             result: success
-        - timed: '{cron-string}'
+        - timed: 'H/30 * * * *'
     wrappers:
         - ansicolor:
             colormap: xterm
@@ -106,29 +105,6 @@
     jobs:
         - 'kubernetes-e2e-{suffix}'
 
-- project:
-    name: kubernetes-aws
-    test-owner: 'bburns'
-    disabled: true
-    emails: 'bburns@google.com'
-    cron-string: '@daily'
-    trigger-job: ''
-    suffix:
-        - 'aws':
-            description: 'Run e2e tests on AWS using the latest successful Kubernetes build.'
-            timeout: 240
-            branch: 'master'
-        - 'aws-parallel':
-            description: 'Run parallel e2e tests on AWS using the latest successful Kubernetes build.'
-            timeout: 60
-            branch: 'master'
-        - 'aws-release-1.1':
-            description: 'Run e2e tests on AWS using the latest successful 1.1 Kubernetes build.'
-            timeout: 240
-            branch: 'release-1.1'
-    jobs:
-        - 'kubernetes-e2e-{suffix}'
-
 - project:
     name: kubernetes-e2e-gke-1.1
     trigger-job: 'kubernetes-build-1.1'