Reenable kubeadm presubmit test.

This had been previously disabled by #2568. Adding the job back to the bazel pipeline and reenabling. Also, remove sporadic trailing whitespace.
kubernetes · Jun 17, 2017 · 5e0a9cf · 5e0a9cf
1 parent a344453
commit 5e0a9cf
Showing 1 changed file with 94 additions and 94 deletions.
diff --git a/prow/config.yaml b/prow/config.yaml
@@ -80,53 +80,53 @@ presubmits:
       - name: cache-ssd
         hostPath:
           path: /mnt/disks/ssd0
-
-  - name: pull-kubernetes-e2e-kubeadm-gce
-    context: pull-kubernetes-e2e-kubeadm-gce
-    always_run: false
-    skip_report: true
-    rerun_command: "/test pull-kubernetes-e2e-kubeadm-gce"
-    trigger: "((?m)^@k8s-bot pull-kubernetes-e2e-kubeadm-gce test this,?(\\s+|$)|(?m)^/test pull-kubernetes-e2e-kubeadm-gce,?(\\s+|$))"
-    spec:
-      containers:
-      - image: gcr.io/k8s-testimages/e2e-kubeadm:v20170616-3665d891
-        args:
-        - "--pull=$(PULL_REFS)"
-        - "--upload=gs://kubernetes-jenkins/pr-logs"
-        - "--git-cache=/root/.cache/git"
-        - "--timeout=75"
-        - "--json"
-        - "--clean"
-        env:
-        - name: GOOGLE_APPLICATION_CREDENTIALS
-          value: /etc/service-account/service-account.json
-        - name:  JENKINS_GCE_SSH_PRIVATE_KEY_FILE
-          value: /etc/ssh-key-secret/ssh-private
-        - name:  JENKINS_GCE_SSH_PUBLIC_KEY_FILE
-          value: /etc/ssh-key-secret/ssh-public
-        volumeMounts:
+    run_after_success:
+    - name: pull-kubernetes-e2e-kubeadm-gce
+      context: pull-kubernetes-e2e-kubeadm-gce
+      always_run: false
+      skip_report: true
+      rerun_command: "/test pull-kubernetes-e2e-kubeadm-gce"
+      trigger: "((?m)^@k8s-bot pull-kubernetes-e2e-kubeadm-gce test this,?(\\s+|$)|(?m)^/test pull-kubernetes-e2e-kubeadm-gce,?(\\s+|$))"
+      spec:
+        containers:
+        - image: gcr.io/k8s-testimages/e2e-kubeadm:v20170616-3665d891
+          args:
+          - "--pull=$(PULL_REFS)"
+          - "--upload=gs://kubernetes-jenkins/pr-logs"
+          - "--git-cache=/root/.cache/git"
+          - "--timeout=75"
+          - "--json"
+          - "--clean"
+          env:
+          - name: GOOGLE_APPLICATION_CREDENTIALS
+            value: /etc/service-account/service-account.json
+          - name:  JENKINS_GCE_SSH_PRIVATE_KEY_FILE
+            value: /etc/ssh-key-secret/ssh-private
+          - name:  JENKINS_GCE_SSH_PUBLIC_KEY_FILE
+            value: /etc/ssh-key-secret/ssh-public
+          volumeMounts:
+          - name: service
+            mountPath: /etc/service-account
+            readOnly: true
+          - name: ssh
+            mountPath: /etc/ssh-key-secret
+            readOnly: true
+          - name: cache-ssd
+            mountPath: /root/.cache
+          ports:
+          - containerPort: 9999
+            hostPort: 9999
+        volumes:
         - name: service
-          mountPath: /etc/service-account
-          readOnly: true
+          secret:
+            secretName: service-account
         - name: ssh
-          mountPath: /etc/ssh-key-secret
-          readOnly: true
+          secret:
+            secretName: ssh-key-secret
+            defaultMode: 0400
         - name: cache-ssd
-          mountPath: /root/.cache
-        ports:
-        - containerPort: 9999
-          hostPort: 9999
-      volumes:
-      - name: service
-        secret:
-          secretName: service-account
-      - name: ssh
-        secret:
-          secretName: ssh-key-secret
-          defaultMode: 0400
-      - name: cache-ssd
-        hostPath:
-          path: /mnt/disks/ssd0
+          hostPath:
+            path: /mnt/disks/ssd0
 
   - name: pull-kubernetes-cross
     context: pull-kubernetes-cross
@@ -361,53 +361,53 @@ presubmits:
       - name: cache-ssd
         hostPath:
           path: /mnt/disks/ssd0
-
-  - name: pull-security-kubernetes-e2e-kubeadm-gce
-    context: pull-security-kubernetes-e2e-kubeadm-gce
-    always_run: false
-    skip_report: true
-    rerun_command: "/test pull-security-kubernetes-e2e-kubeadm-gce"
-    trigger: "((?m)^@k8s-bot pull-security-kubernetes-e2e-kubeadm-gce test this,?(\\s+|$)|(?m)^/test pull-security-kubernetes-e2e-kubeadm-gce,?(\\s+|$))"
-    spec:
-      containers:
-      - image: gcr.io/k8s-testimages/e2e-kubeadm:v20170616-3665d891
-        args:
-        - "--pull=$(PULL_REFS)"
-        - "--upload=gs://kubernetes-jenkins/pr-logs"
-        - "--git-cache=/root/.cache/git"
-        - "--timeout=75"
-        - "--json"
-        - "--clean"
-        env:
-        - name: GOOGLE_APPLICATION_CREDENTIALS
-          value: /etc/service-account/service-account.json
-        - name:  JENKINS_GCE_SSH_PRIVATE_KEY_FILE
-          value: /etc/ssh-key-secret/ssh-private
-        - name:  JENKINS_GCE_SSH_PUBLIC_KEY_FILE
-          value: /etc/ssh-key-secret/ssh-public
-        volumeMounts:
+    run_after_success:
+    - name: pull-security-kubernetes-e2e-kubeadm-gce
+      context: pull-security-kubernetes-e2e-kubeadm-gce
+      always_run: false
+      skip_report: true
+      rerun_command: "/test pull-security-kubernetes-e2e-kubeadm-gce"
+      trigger: "((?m)^@k8s-bot pull-security-kubernetes-e2e-kubeadm-gce test this,?(\\s+|$)|(?m)^/test pull-security-kubernetes-e2e-kubeadm-gce,?(\\s+|$))"
+      spec:
+        containers:
+        - image: gcr.io/k8s-testimages/e2e-kubeadm:v20170616-3665d891
+          args:
+          - "--pull=$(PULL_REFS)"
+          - "--upload=gs://kubernetes-jenkins/pr-logs"
+          - "--git-cache=/root/.cache/git"
+          - "--timeout=75"
+          - "--json"
+          - "--clean"
+          env:
+          - name: GOOGLE_APPLICATION_CREDENTIALS
+            value: /etc/service-account/service-account.json
+          - name:  JENKINS_GCE_SSH_PRIVATE_KEY_FILE
+            value: /etc/ssh-key-secret/ssh-private
+          - name:  JENKINS_GCE_SSH_PUBLIC_KEY_FILE
+            value: /etc/ssh-key-secret/ssh-public
+          volumeMounts:
+          - name: service
+            mountPath: /etc/service-account
+            readOnly: true
+          - name: ssh
+            mountPath: /etc/ssh-key-secret
+            readOnly: true
+          - name: cache-ssd
+            mountPath: /root/.cache
+          ports:
+          - containerPort: 9999
+            hostPort: 9999
+        volumes:
         - name: service
-          mountPath: /etc/service-account
-          readOnly: true
+          secret:
+            secretName: service-account
         - name: ssh
-          mountPath: /etc/ssh-key-secret
-          readOnly: true
+          secret:
+            secretName: ssh-key-secret
+            defaultMode: 0400
         - name: cache-ssd
-          mountPath: /root/.cache
-        ports:
-        - containerPort: 9999
-          hostPort: 9999
-      volumes:
-      - name: service
-        secret:
-          secretName: service-account
-      - name: ssh
-        secret:
-          secretName: ssh-key-secret
-          defaultMode: 0400
-      - name: cache-ssd
-        hostPath:
-          path: /mnt/disks/ssd0
+          hostPath:
+            path: /mnt/disks/ssd0
 
   - name: pull-security-kubernetes-cross
     context: pull-security-kubernetes-cross
@@ -948,7 +948,7 @@ postsubmits:
           mountPath: /root/.cache
         ports:
         - containerPort: 9999
-          hostPort: 9999  
+          hostPort: 9999
       volumes:
       - name: service
         secret:
@@ -979,7 +979,7 @@ postsubmits:
             mountPath: /root/.cache
           ports:
           - containerPort: 9999
-            hostPort: 9999  
+            hostPort: 9999
         volumes:
         - name: service
           secret:
@@ -1017,7 +1017,7 @@ postsubmits:
               mountPath: /root/.cache
             ports:
             - containerPort: 9999
-              hostPort: 9999 
+              hostPort: 9999
           volumes:
           - name: service
             secret:
@@ -1292,7 +1292,7 @@ periodics:
             mountPath: /root/.cache
           ports:
           - containerPort: 9999
-            hostPort: 9999  
+            hostPort: 9999
         volumes:
         - name: service
           secret:
@@ -1362,7 +1362,7 @@ periodics:
           mountPath: /root/.cache
         ports:
         - containerPort: 9999
-          hostPort: 9999  
+          hostPort: 9999
       volumes:
       - name: service
         secret:
@@ -5927,7 +5927,7 @@ periodics:
       secret:
         defaultMode: 256
         secretName: ssh-key-secret
-        
+
 - interval: 1h
   name: ci-kubernetes-e2e-gce-audit
   spec: