From 7b1d15ad58fe07a3e548c1bbf27ee7ce1ea35b3f Mon Sep 17 00:00:00 2001
From: Jeff Grafton <jgrafton@google.com>
Date: Mon, 19 Oct 2015 14:31:39 -0700
Subject: [PATCH] Save config for gce weekly soak deploy and add release-1.1
 gce soak

---
 hack/jenkins/e2e.sh | 38 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 38 insertions(+)

diff --git a/hack/jenkins/e2e.sh b/hack/jenkins/e2e.sh
index 2ef6da7e70d..4966a96cd02 100755
--- a/hack/jenkins/e2e.sh
+++ b/hack/jenkins/e2e.sh
@@ -373,6 +373,17 @@ case ${JOB_NAME} in
     TEST_CLUSTER_RESYNC_PERIOD="--min-resync-period=12h"
     ;;
 
+  # Sets up the GCE soak cluster weekly using the latest CI release.
+  kubernetes-soak-weekly-deploy-gce)
+    : ${E2E_CLUSTER_NAME:="gce-soak-weekly"}
+    : ${E2E_DOWN:="false"}
+    : ${E2E_NETWORK:="gce-soak-weekly"}
+    : ${E2E_TEST:="false"}
+    : ${E2E_UP:="true"}
+    : ${KUBE_GCE_INSTANCE_PREFIX:="gce-soak-weekly"}
+    : ${PROJECT:="kubernetes-jenkins"}
+    ;;
+
   # Runs tests on GCE soak cluster.
   kubernetes-soak-continuous-e2e-gce)
     : ${E2E_CLUSTER_NAME:="gce-soak-weekly"}
@@ -388,6 +399,33 @@ case ${JOB_NAME} in
     : ${PROJECT:="kubernetes-jenkins"}
     ;;
 
+  # Sets up the GCE soak cluster weekly using the latest 1.1 release.
+  kubernetes-soak-weekly-deploy-gce-release-1.1)
+    : ${E2E_CLUSTER_NAME:="gce-soak-weekly-release-1.1"}
+    : ${E2E_DOWN:="false"}
+    : ${E2E_NETWORK:="gce-soak-weekly-release-1.1"}
+    : ${E2E_TEST:="false"}
+    : ${E2E_UP:="true"}
+    : ${KUBE_GCE_INSTANCE_PREFIX:="gce-soak-weekly-release-1.1"}
+    : ${KUBE_GCS_STAGING_PATH_SUFFIX:="release-1.1"}
+    : ${PROJECT:="kubernetes-jenkins"}
+    ;;
+
+  # Runs tests on GCE soak cluster for latest 1.1 release.
+  kubernetes-soak-continuous-e2e-gce-release-1.1)
+    : ${E2E_CLUSTER_NAME:="gce-soak-weekly-release-1.1"}
+    : ${E2E_DOWN:="false"}
+    : ${E2E_NETWORK:="gce-soak-weekly-release-1.1"}
+    : ${E2E_UP:="false"}
+    : ${GINKGO_TEST_ARGS:="--ginkgo.skip=$(join_regex_allow_empty \
+          ${GCE_DEFAULT_SKIP_TESTS[@]:+${GCE_DEFAULT_SKIP_TESTS[@]}} \
+          ${GCE_FLAKY_TESTS[@]:+${GCE_FLAKY_TESTS[@]}} \
+          ${GCE_SOAK_CONTINUOUS_SKIP_TESTS[@]:+${GCE_SOAK_CONTINUOUS_SKIP_TESTS[@]}} \
+          )"}
+    : ${KUBE_GCE_INSTANCE_PREFIX:="gce-soak-weekly-release-1.1"}
+    : ${PROJECT:="kubernetes-jenkins"}
+    ;;
+
   # Runs non-flaky tests on GCE on the release-1.0 branch,
   # sequentially. As a reminder, if you need to change the skip list
   # or flaky test list on the release branch, you'll need to propose a