Merge pull request #304 from Random-Liu/add-node-e2e-version-printer

Add node e2e version printer for docker validation test.
kubernetes · Jul 23, 2016 · 7f19652 · 7f19652
2 parents b6c6c84 + 28beeae
commit 7f19652
Showing 1 changed file with 15 additions and 4 deletions.
diff --git a/jenkins/job-configs/kubernetes-jenkins/continuous-docker-validation.yaml b/jenkins/job-configs/kubernetes-jenkins/continuous-docker-validation.yaml
@@ -5,7 +5,7 @@
 # A custom publisher that prints out critical software versions (OS, K8s, and
 # Docker) in the build history page.
 - publisher:
-    name: version-printer
+    name: e2e-version-printer
     publishers:
         - groovy-postbuild:
             script: |
@@ -16,7 +16,6 @@
                 def dockerVersionMatcher = manager.getLogMatcher("KUBE_GCI_DOCKER_VERSION=(.*)")
                 if(dockerVersionMatcher?.matches()) manager.addShortText("<b>Docker Version: " + dockerVersionMatcher.group(1) + "</b>", "grey", "white", "0px", "white")
 
-
 # Template for the continuous e2e Docker validation jobs.
 - job-template:
     name: 'continuous-e2e-docker-validation-{os-distro}'
@@ -47,7 +46,7 @@
         - gcs-uploader
         - description-setter:
             regexp: KUBE_GCE_MASTER_IMAGE=(.*)
-        - version-printer
+        - e2e-version-printer
     # Need the 8 essential kube-system pods ready before declaring cluster ready
     # etcd-server, kube-apiserver, kube-controller-manager, kube-dns
     # kube-scheduler, l7-default-backend, l7-lb-controller, kube-addon-manager
@@ -76,6 +75,18 @@
     test-owner: 'dchen1107'
     emails: 'dawnchen@google.com'
 
+# A custom publisher that prints out critical software versions (OS, and
+# Docker) in the build history page.
+- publisher:
+    name: node-e2e-version-printer
+    publishers:
+        - groovy-postbuild:
+            script: |
+                def imageMatcher = manager.getLogMatcher("GCI_IMAGE=(.*)")
+                if(imageMatcher?.matches()) manager.addShortText("<b>Image: " + imageMatcher.group(1) + "</b>", "grey", "white", "0px", "white")
+                def dockerVersionMatcher = manager.getLogMatcher("DOCKER_VERSION=(.*)")
+                if(dockerVersionMatcher?.matches()) manager.addShortText("<b>Docker Version: " + dockerVersionMatcher.group(1) + "</b>", "grey", "white", "0px", "white")
+
 # Template for the continuous node e2e Docker validation jobs.
 - job-template:
     name: 'continuous-node-e2e-docker-validation-{os-distro}'
@@ -109,7 +120,7 @@
         - email-ext:
             recipients: '{emails}'
         - gcs-uploader
-        - version-printer
+        - node-e2e-version-printer
     wrappers:
         - ansicolor:
             colormap: xterm