Merge pull request #1209 from goltermann/critical

Separate non-blocking from blocking builds in E2E results page.

Author: lavalamp

mungegithub/Makefile

@@ -69,6 +69,12 @@ secret:
 clean:
 	rm -f mungegithub $(APP)/local.deployment.yaml $(APP)/local.secret.yaml
 
+# pull down current public queue state, and run UI based off that data
+ui-stub:
+	@/bin/bash -c "wget -q -r -nH -P ./submit-queue/www http://submit-queue.k8s.io/{prs,github-e2e-queue,history,sq-stats,stats,users,health,google-internal-ci,priority-info,merge-info}; \
+	pushd ./submit-queue/www; \
+	python -m SimpleHTTPServer;"
+
 help:
 	@echo "ENVIRONMENT VARS:"
 	@echo " REPO=       repository for the docker image being build. Default: $(REPO)"

mungegithub/submit-queue/www/index.html

@@ -148,12 +148,21 @@ <h4 class="md-body-2">{{pr.Reason}}</h4>
               <md-toolbar class="md-whiteframe-z2">
                 <h2 class="md-toolbar-tools">End-to-End Results</h2>
               </md-toolbar>
+              <h2 class="md-title" ng-show="cntl.builds.length > 0">Queue-Blocking Builds</h2>
               <md-chips ng-model="cntl.builds" readonly="true">
                 <md-chip-template title="{{$chip.msg}}">
                   <span style="color: {{$chip.color}}">{{$chip.state}}</span> <a ng-href="http://ci-test.k8s.io/{{$chip.name}}/{{$chip.id}}/">{{$chip.name}}</a>
                   <span style="color: {{$chip.color}}">{{$chip.msg}}</span> <span title="Job stability">{{$chip.stability}}</span>
                 </md-chip-template>
               </md-chips>
+              <h2 class="md-title" ng-show="cntl.nonBlockingBuilds.length > 0">Non-Queue-Blocking Builds</h2>
+              <md-chips ng-model="cntl.nonBlockingBuilds" readonly="true">
+                <md-chip-template title="{{$chip.msg}}">
+                  <span style="color: {{$chip.color}}">{{$chip.state}}</span> <a ng-href="http://ci-test.k8s.io/{{$chip.name}}/{{$chip.id}}/">{{$chip.name}}</a>
+                  <span style="color: {{$chip.color}}">{{$chip.msg}}</span> <span title="Job stability">{{$chip.stability}}</span>
+                </md-chip-template>
+              </md-chips>
+              <br>
               <br>
               <h2 class="md-title" ng-show="cntl.OverallHealth.length > 0">Overall Health: {{ cntl.OverallHealth }}</h2>
               <p>Health percents are the fraction of the time that a given job is stable for the last day, or since the submit queue restarted ({{ cntl.sqStats.StartTime | date:'medium'}})</span>, whichever is shorter. The <a href="http://storage.googleapis.com/kubernetes-test-history/static/index.html"><strong>24-Hour Test Report</strong></a> shows more detail, along with a list of flaky and broken tests in merge-blocking jobs.</p>

mungegithub/submit-queue/www/script.js

@@ -11,6 +11,7 @@ function SQCntl(dataService, $interval, $location) {
   var self = this;
   self.prs = {};
   self.builds = {};
+  self.nonBlockingBuilds = {};
   self.health = {};
   self.lastMergeTime = Date();
   self.prQuerySearch = prQuerySearch;
@@ -165,21 +166,23 @@ function SQCntl(dataService, $interval, $location) {
         var percentStable = self.health.NumStable * 100.0 / self.health.TotalLoops;
         self.OverallHealth = Math.round(percentStable) + "%";
       }
-      updateBuildStability(self.builds, self.health);
+      updateBuildStability(self.builds, self.nonBlockingBuilds, self.health);
     });
   }
 
   function refreshGoogleInternalCI() {
     dataService.getData('google-internal-ci').then(function successCallback(response) {
       var result = getE2E(response.data);
       self.builds = result.builds;
-      updateBuildStability(self.builds, self.health);
+      self.nonBlockingBuilds = result.nonBlockingBuilds;
+      updateBuildStability(self.builds, self.nonBlockingBuilds, self.health);
       self.failedBuild = result.failedBuild;
     });
   }
 
   function getE2E(builds) {
     var result = [];
+    var nonBlockingResult = [];
     var failedBuild = false;
     angular.forEach(builds, function(job, key) {
       var obj = {
@@ -235,19 +238,25 @@ function SQCntl(dataService, $interval, $location) {
           failedBuild = true;
       }
       obj.stability = '';
-      result.push(obj);
+      if (!obj.msg) {
+        result.push(obj);
+      } else {
+        if (obj.msg.includes('[nonblocking]')) {
+          obj.msg = obj.msg.replace('[nonblocking]', '');
+          nonBlockingResult.push(obj);
+        } else {
+          result.push(obj);
+        }
+      }
     });
     return {
       builds: result,
+      nonBlockingBuilds: nonBlockingResult,
       failedBuild: failedBuild,
     };
   }
 
-  function updateBuildStability(builds, health) {
-    if (Object.keys(builds).length === 0 ||
-        health.TotalLoops === 0 || health.NumStablePerJob === undefined) {
-      return;
-    }
+  function updateBuildStabilityHelper(builds, health) {
     angular.forEach(builds, function(build) {
       var key = build.name;
       if (key in self.health.NumStablePerJob) {
@@ -257,6 +266,15 @@ function SQCntl(dataService, $interval, $location) {
     });
   }
 
+  function updateBuildStability(builds, nonBlockingBuilds, health) {
+    if (Object.keys(builds).length === 0 ||
+        health.TotalLoops === 0 || health.NumStablePerJob === undefined) {
+      return;
+    }
+    updateBuildStabilityHelper(builds, health);
+    updateBuildStabilityHelper(nonBlockingBuilds, health);
+  }
+
   function searchTermsContain(terms, value) {
     var found = false;
     angular.forEach(terms, function(term) {