From 91015e0eff916b6794dcb1e904b215fd86e79db8 Mon Sep 17 00:00:00 2001
From: Euan Kemp <euank@coreos.com>
Date: Wed, 3 Aug 2016 12:01:08 -0700
Subject: [PATCH] node_e2e: Use upstream CoreOS image directly

---
 test/e2e_node/jenkins/coreos-init.yaml  | 36 +++++++++++++++++++++++++
 test/e2e_node/jenkins/image-config.yaml |  7 ++---
 2 files changed, 40 insertions(+), 3 deletions(-)
 create mode 100644 test/e2e_node/jenkins/coreos-init.yaml

diff --git a/test/e2e_node/jenkins/coreos-init.yaml b/test/e2e_node/jenkins/coreos-init.yaml
new file mode 100644
index 00000000000..d9029c3cb5e
--- /dev/null
+++ b/test/e2e_node/jenkins/coreos-init.yaml
@@ -0,0 +1,36 @@
+#cloud-config
+
+users:
+  - name: "jenkins"
+    groups: 
+      - "docker"
+      - "sudo"
+
+
+coreos:
+  units:
+    - name: "docker.service"
+      enable: true
+      drop-ins:
+        - name: 10-disable-systemd-cgroup-driver.conf
+          content: |
+            [Service]
+            CPUAccounting=yes
+            MemoryAccounting=yes
+            # Temporary, remove after https://github.com/coreos/bugs/issues/1435 is resolved
+            Environment="DOCKER_CGROUPS="
+    - name: "update-engine.service"
+      mask: true
+    - name: "locksmithd.service"
+      mask: true
+    - name: "node-e2e-test-setup.service"
+      command: "start"
+      content: |
+        [Unit]
+        Description=Setup a vanilla CoreOS image for use by Node e2e
+        WantedBy=multi-user.target
+        [Service]
+        Type=oneshot
+        RemainAfterExit=yes
+        # chain `ExecStartPre`'s here to do any setup
+        ExecStart=/bin/true
diff --git a/test/e2e_node/jenkins/image-config.yaml b/test/e2e_node/jenkins/image-config.yaml
index 14be87fcbd2..52cc9e270a8 100644
--- a/test/e2e_node/jenkins/image-config.yaml
+++ b/test/e2e_node/jenkins/image-config.yaml
@@ -8,9 +8,10 @@ images:
   ubuntu-docker10:
     image: e2e-node-ubuntu-trusty-docker10-v1-image
     project: kubernetes-node-e2e-images
-  coreos-stable:
-    image: e2e-node-coreos-alpha-1068-20160707-image
-    project: kubernetes-node-e2e-images
+  coreos-alpha:
+    image: coreos-alpha-1122-0-0-v20160727
+    project: coreos-cloud
+    metadata: "user-data<test/e2e_node/jenkins/coreos-init.yaml"
   containervm:
     image: e2e-node-containervm-v20160321-image
     project: kubernetes-node-e2e-images