Reenable kubeadm presubmit test.

This had been previously disabled by kubernetes#2568. Adding the job back to the bazel pipeline and reenabling. Also, remove sporadic trailing whitespace.
pipejakob · Jun 6, 2017 · 77e23e4 · 77e23e4
1 parent 25db62f
commit 77e23e4
Showing 1 changed file with 99 additions and 101 deletions.
diff --git a/prow/config.yaml b/prow/config.yaml
@@ -72,61 +72,60 @@ presubmits:
           mountPath: /root/.cache
         ports:
         - containerPort: 9999
-          hostPort: 9999  
+          hostPort: 9999
       volumes:
       - name: service
         secret:
           secretName: service-account
       - 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: "@k8s-bot pull-kubernetes-e2e-kubeadm-gce test this"
-    trigger: "@k8s-bot (pull-kubernetes-e2e-kubeadm-gce |kubeadm e2e )?test this"
-    spec:
-      containers:
-      - image: gcr.io/k8s-testimages/e2e-kubeadm:0.4
-        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: true
+      rerun_command: "@k8s-bot pull-kubernetes-e2e-kubeadm-gce test this"
+      trigger: "@k8s-bot (pull-kubernetes-e2e-kubeadm-gce |kubeadm e2e )?test this"
+      spec:
+        containers:
+        - image: gcr.io/k8s-testimages/e2e-kubeadm:0.4
+          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
@@ -354,61 +353,60 @@ presubmits:
           mountPath: /root/.cache
         ports:
         - containerPort: 9999
-          hostPort: 9999   
+          hostPort: 9999
       volumes:
       - name: service
         secret:
           secretName: service-account
       - 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: "@k8s-bot pull-security-kubernetes-e2e-kubeadm-gce test this"
-    trigger: "@k8s-bot (pull-security-kubernetes-e2e-kubeadm-gce |kubeadm e2e )?test this"
-    spec:
-      containers:
-      - image: gcr.io/k8s-testimages/e2e-kubeadm:0.4
-        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: true
+      rerun_command: "@k8s-bot pull-security-kubernetes-e2e-kubeadm-gce test this"
+      trigger: "@k8s-bot (pull-security-kubernetes-e2e-kubeadm-gce |kubeadm e2e )?test this"
+      spec:
+        containers:
+        - image: gcr.io/k8s-testimages/e2e-kubeadm:0.4
+          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
@@ -700,7 +698,7 @@ presubmits:
           mountPath: /root/.cache
         ports:
         - containerPort: 9999
-          hostPort: 9999  
+          hostPort: 9999
       volumes:
       - name: service
         secret:
@@ -737,7 +735,7 @@ postsubmits:
           mountPath: /root/.cache
         ports:
         - containerPort: 9999
-          hostPort: 9999  
+          hostPort: 9999
       volumes:
       - name: service
         secret:
@@ -768,7 +766,7 @@ postsubmits:
             mountPath: /root/.cache
           ports:
           - containerPort: 9999
-            hostPort: 9999  
+            hostPort: 9999
         volumes:
         - name: service
           secret:
@@ -806,7 +804,7 @@ postsubmits:
               mountPath: /root/.cache
             ports:
             - containerPort: 9999
-              hostPort: 9999 
+              hostPort: 9999
           volumes:
           - name: service
             secret:
@@ -844,7 +842,7 @@ postsubmits:
           mountPath: /root/.cache
         ports:
         - containerPort: 9999
-          hostPort: 9999  
+          hostPort: 9999
       volumes:
       - name: service
         secret:
@@ -875,7 +873,7 @@ postsubmits:
             mountPath: /root/.cache
           ports:
           - containerPort: 9999
-            hostPort: 9999  
+            hostPort: 9999
         volumes:
         - name: service
           secret:
@@ -913,7 +911,7 @@ postsubmits:
               mountPath: /root/.cache
             ports:
             - containerPort: 9999
-              hostPort: 9999 
+              hostPort: 9999
           volumes:
           - name: service
             secret:
@@ -951,7 +949,7 @@ postsubmits:
           mountPath: /root/.cache
         ports:
         - containerPort: 9999
-          hostPort: 9999  
+          hostPort: 9999
       volumes:
       - name: service
         secret:
@@ -1025,7 +1023,7 @@ periodics:
         mountPath: /root/.cache
       ports:
       - containerPort: 9999
-        hostPort: 9999  
+        hostPort: 9999
     volumes:
     - name: service
       secret:
@@ -1140,7 +1138,7 @@ periodics:
           mountPath: /root/.cache
         ports:
         - containerPort: 9999
-          hostPort: 9999  
+          hostPort: 9999
       volumes:
       - name: service
         secret:
@@ -1178,7 +1176,7 @@ periodics:
             mountPath: /root/.cache
           ports:
           - containerPort: 9999
-            hostPort: 9999  
+            hostPort: 9999
         volumes:
         - name: service
           secret: